From 0425a4e396ddef4caf46974bb60eb350f459c2c7 Mon Sep 17 00:00:00 2001 From: Kashargul Date: Thu, 12 Sep 2024 00:00:11 +0200 Subject: [PATCH] up to officer --- code/__defines/jobs.dm | 40 +++++++++++++++++ code/controllers/subsystems/ticker.dm | 2 +- code/datums/datacore.dm | 2 +- code/datums/outfits/jobs/command.dm | 8 ++-- code/datums/outfits/jobs/security.dm | 8 ++-- code/datums/supplypacks/security.dm | 8 ++-- code/game/antagonist/mutiny/mutineer.dm | 6 +-- code/game/antagonist/outsider/ert.dm | 2 +- code/game/antagonist/station/changeling.dm | 2 +- code/game/antagonist/station/cultist.dm | 4 +- code/game/antagonist/station/infiltrator.dm | 2 +- code/game/antagonist/station/revolutionary.dm | 4 +- code/game/antagonist/station/traitor.dm | 2 +- code/game/gamemodes/objective.dm | 1 - code/game/jobs/access_datum.dm | 2 +- code/game/jobs/job/captain.dm | 23 +++++----- code/game/jobs/job/civilian.dm | 20 ++++----- code/game/jobs/job/civilian_chaplain.dm | 2 +- code/game/jobs/job/civilian_vr.dm | 6 +-- code/game/jobs/job/engineering.dm | 2 +- code/game/jobs/job/exploration_vr.dm | 4 +- code/game/jobs/job/medical.dm | 4 +- code/game/jobs/job/science.dm | 2 +- code/game/jobs/job/security.dm | 44 +++++++++---------- code/game/jobs/job/security_vr.dm | 4 +- code/game/jobs/job_controller.dm | 4 +- .../machinery/computer3/computers/card.dm | 2 +- .../objects/effects/job_start_landmarks.dm | 16 +++---- .../objects/items/devices/radio/headset.dm | 4 +- code/game/objects/items/toys/toys.dm | 28 ++++++------ code/game/objects/items/toys/toys_vr.dm | 2 +- .../objects/items/weapons/dna_injector.dm | 2 +- .../items/weapons/grenades/flashbang.dm | 4 +- .../objects/items/weapons/id cards/cards.dm | 2 +- .../items/weapons/id cards/id_stacks.dm | 16 +++++-- .../items/weapons/id cards/station_ids.dm | 27 ++++++------ code/game/response_team.dm | 2 +- code/modules/admin/newbanjob.dm | 20 ++++----- code/modules/admin/verbs/debug.dm | 2 +- code/modules/awaymissions/corpse.dm | 11 +++-- .../loadout/loadout_accessories.dm | 4 +- .../preference_setup/loadout/loadout_eyes.dm | 6 +-- .../loadout/loadout_eyes_vr.dm | 4 +- .../loadout/loadout_fluffitems_vr.dm | 18 ++++---- .../loadout/loadout_gloves.dm | 2 +- .../preference_setup/loadout/loadout_head.dm | 10 ++--- .../loadout/loadout_head_vr.dm | 2 +- .../preference_setup/loadout/loadout_shoes.dm | 4 +- .../preference_setup/loadout/loadout_suit.dm | 28 ++++++------ .../loadout/loadout_suit_vr.dm | 10 ++--- .../loadout/loadout_uni_selector.dm | 26 +++++------ .../loadout/loadout_uniform.dm | 4 +- .../loadout/loadout_uniform_vr.dm | 6 +-- .../loadout/loadout_utility_vr.dm | 2 +- .../preference_setup/loadout/loadout_xeno.dm | 32 +++++++------- .../loadout/loadout_xeno_vr.dm | 2 +- code/modules/clothing/head/jobs.dm | 22 +++++----- code/modules/clothing/head/neohats.dm | 4 +- code/modules/clothing/masks/hailer.dm | 2 +- .../clothing/spacesuits/miscellaneous.dm | 2 +- code/modules/clothing/suits/aliens/teshari.dm | 11 +++-- code/modules/clothing/suits/armor.dm | 4 +- code/modules/clothing/suits/jobs.dm | 4 +- .../under/accessories/accessory_vr.dm | 4 +- .../clothing/under/accessories/badges.dm | 8 ++-- code/modules/clothing/under/eva_bodysuits.dm | 2 +- code/modules/clothing/under/jobs/civilian.dm | 4 +- code/modules/clothing/under/jobs/security.dm | 13 +++--- code/modules/clothing/under/miscellaneous.dm | 4 +- code/modules/clothing/under/shorts.dm | 4 +- code/modules/clothing/under/xenos/teshari.dm | 6 +-- code/modules/events/money_hacker.dm | 4 +- code/modules/flufftext/Dreaming.dm | 8 ++-- code/modules/food/food/drinks.dm | 7 ++- .../event2/events/command/money_hacker.dm | 4 +- code/modules/games/cah_black_cards.dm | 18 ++++---- .../legal_code_data/corporate_regulations.dm | 26 +++++------ .../lore_codex/legal_code_data/main.dm | 4 +- .../lore_codex/legal_code_data/sif_law.dm | 2 +- .../modules/lore_codex/legal_code_data/sop.dm | 34 +++++++------- .../lore_codex/legal_code_data/sop/medical.dm | 4 +- .../legal_code_data/sop/security.dm | 20 ++++----- code/modules/lore_codex/news_data/main.dm | 6 +-- code/modules/mob/living/silicon/laws.dm | 2 +- .../simple_mob/subtypes/animal/pets/fox_vr.dm | 2 +- code/modules/mob/new_player/skill.dm | 2 +- code/modules/paperwork/folders.dm | 2 +- code/modules/paperwork/paper.dm | 4 +- code/modules/projectiles/guns/energy/stun.dm | 2 +- .../projectiles/guns/projectile/pistol.dm | 4 +- .../projectiles/guns/projectile/revolver.dm | 6 +-- .../vore/fluffstuff/custom_clothes_vr.dm | 4 +- .../loadout/loadout_accessories.dm | 14 +++--- vorestation.dme | 1 + 94 files changed, 412 insertions(+), 368 deletions(-) create mode 100644 code/__defines/jobs.dm diff --git a/code/__defines/jobs.dm b/code/__defines/jobs.dm new file mode 100644 index 0000000000..0ed0fe3d40 --- /dev/null +++ b/code/__defines/jobs.dm @@ -0,0 +1,40 @@ +// Station ranks +#define RANK_HEADS "Heads" + + +// Main Station Jobs +#define JOB_SITE_MANAGER "Site Manager" +#define JOB_HEAD_OF_PERSONNEL "Head of Personnel" +#define JOB_COMMAND_SECRETARY "Command Secretary" +#define JOB_HEAD_OF_SECURITY "Head of Security" +#define JOB_WARDEN "Warden" +#define JOB_DETECTIVE "Detective" +#define JOB_SECURITY_OFFICER "Security Officer" + + + + +#define JOB_SHAFT_MINER "Shaft Miner" + + +// Security alt titles +#define JOB_ALT_FORENSIC_TECHNICIAN "Forensic Technician" +#define JOB_ALT_JUNIOR_OFFICER "Junior Officer" + +/* +"Emergency Response Team" + "Syndicate" + + + alt_titles = list("Patrol Officer" = /datum/alt_title/patrol_officer, "Security Guard" = /datum/alt_title/security_guard, + "Security Deputy" = /datum/alt_title/security_guard, JOB_ALT_JUNIOR_OFFICER = /datum/alt_title/junior_officer, "Security Contractor" = /datum/alt_title/security_contractor) + + + alt_titles = list("Investigator" = /datum/alt_title/investigator, "Security Inspector" = /datum/alt_title/security_inspector, JOB_ALT_FORENSIC_TECHNICIAN = /datum/alt_title/forensic_tech) + + + alt_titles = list("Brig Sentry" = /datum/alt_title/brig_sentry, "Armory Superintendent" = /datum/alt_title/armory_superintendent, "Master-at-Arms" = /datum/alt_title/master_at_arms) + + + alt_titles = list("Security Commander" = /datum/alt_title/sec_commander, "Chief of Security" = /datum/alt_title/sec_chief, "Security Manager" = /datum/alt_title/security_manager) +*/ diff --git a/code/controllers/subsystems/ticker.dm b/code/controllers/subsystems/ticker.dm index 4ff5e5a18b..7ba85e05a9 100644 --- a/code/controllers/subsystems/ticker.dm +++ b/code/controllers/subsystems/ticker.dm @@ -433,7 +433,7 @@ var/global/datum/controller/subsystem/ticker/ticker var/captainless=1 for(var/mob/living/carbon/human/player in player_list) if(player && player.mind && player.mind.assigned_role) - if(player.mind.assigned_role == "Site Manager") + if(player.mind.assigned_role == JOB_SITE_MANAGER) captainless=0 if(!player_is_antag(player.mind, only_offstation_roles = 1)) job_master.EquipRank(player, player.mind.assigned_role, 0) diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index 7c37c10f52..23e358730b 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -218,7 +218,7 @@ var/global/list/PDA_Manifest = list() heads[++heads.len] = list("name" = name, "rank" = rank, "active" = isactive) department = 1 depthead = 1 - if(rank=="Site Manager" && heads.len != 1) + if(rank==JOB_SITE_MANAGER && heads.len != 1) heads.Swap(1,heads.len) if(SSjob.is_job_in_department(real_rank, DEPARTMENT_SECURITY)) diff --git a/code/datums/outfits/jobs/command.dm b/code/datums/outfits/jobs/command.dm index d8a74f925d..30d04758dd 100644 --- a/code/datums/outfits/jobs/command.dm +++ b/code/datums/outfits/jobs/command.dm @@ -1,5 +1,5 @@ /decl/hierarchy/outfit/job/captain - name = OUTFIT_JOB_NAME("Captain") + name = OUTFIT_JOB_NAME("Captain") // Keep Captain for now, not JOB_SITE_MANAGER glasses = /obj/item/clothing/glasses/sunglasses uniform = /obj/item/clothing/under/rank/captain l_ear = /obj/item/device/radio/headset/heads/captain @@ -24,7 +24,7 @@ qdel(medal) /decl/hierarchy/outfit/job/hop - name = OUTFIT_JOB_NAME("Head of Personnel") + name = OUTFIT_JOB_NAME(JOB_HEAD_OF_PERSONNEL) uniform = /obj/item/clothing/under/rank/head_of_personnel l_ear = /obj/item/device/radio/headset/heads/hop shoes = /obj/item/clothing/shoes/brown @@ -32,7 +32,7 @@ pda_type = /obj/item/device/pda/heads/hop /decl/hierarchy/outfit/job/secretary - name = OUTFIT_JOB_NAME("Command Secretary") + name = OUTFIT_JOB_NAME(JOB_COMMAND_SECRETARY) l_ear = /obj/item/device/radio/headset/headset_com shoes = /obj/item/clothing/shoes/brown id_type = /obj/item/weapon/card/id/silver/secretary @@ -44,4 +44,4 @@ if(H.gender == FEMALE) uniform = /obj/item/clothing/under/suit_jacket/female/skirt else - uniform = /obj/item/clothing/under/suit_jacket/charcoal \ No newline at end of file + uniform = /obj/item/clothing/under/suit_jacket/charcoal diff --git a/code/datums/outfits/jobs/security.dm b/code/datums/outfits/jobs/security.dm index 4a044d8aaa..26d5d4a443 100644 --- a/code/datums/outfits/jobs/security.dm +++ b/code/datums/outfits/jobs/security.dm @@ -11,21 +11,21 @@ sports_bag = /obj/item/weapon/storage/backpack/sport/sec /decl/hierarchy/outfit/job/security/hos - name = OUTFIT_JOB_NAME("Head of security") + name = OUTFIT_JOB_NAME(JOB_HEAD_OF_SECURITY) l_ear = /obj/item/device/radio/headset/heads/hos uniform = /obj/item/clothing/under/rank/head_of_security id_type = /obj/item/weapon/card/id/security/head pda_type = /obj/item/device/pda/heads/hos /decl/hierarchy/outfit/job/security/warden - name = OUTFIT_JOB_NAME("Warden") + name = OUTFIT_JOB_NAME(JOB_WARDEN) uniform = /obj/item/clothing/under/rank/warden l_pocket = /obj/item/device/flash id_type = /obj/item/weapon/card/id/security/warden pda_type = /obj/item/device/pda/warden /decl/hierarchy/outfit/job/security/detective - name = OUTFIT_JOB_NAME("Detective") + name = OUTFIT_JOB_NAME(JOB_DETECTIVE) head = /obj/item/clothing/head/det uniform = /obj/item/clothing/under/det suit = /obj/item/clothing/suit/storage/det_trench @@ -47,7 +47,7 @@ //VOREStation Edit End /decl/hierarchy/outfit/job/security/officer - name = OUTFIT_JOB_NAME("Security Officer") + name = OUTFIT_JOB_NAME(JOB_SECURITY_OFFICER) uniform = /obj/item/clothing/under/rank/security l_pocket = /obj/item/device/flash id_type = /obj/item/weapon/card/id/security diff --git a/code/datums/supplypacks/security.dm b/code/datums/supplypacks/security.dm index 9e58d74f1c..da8e892702 100644 --- a/code/datums/supplypacks/security.dm +++ b/code/datums/supplypacks/security.dm @@ -546,7 +546,7 @@ access = access_brig /datum/supply_pack/security/wardengear - name = "Gear - Warden equipment" + name = "Gear - " + JOB_WARDEN + " equipment" contains = list( /obj/item/clothing/suit/storage/vest/warden, /obj/item/clothing/under/rank/warden, @@ -571,11 +571,11 @@ ) cost = 20 containertype = /obj/structure/closet/crate/secure/nanotrasen - containername = "Warden equipment" + containername = JOB_WARDEN + " equipment" access = access_armory /datum/supply_pack/security/headofsecgear - name = "Gear - Head of security equipment" + name = "Gear - " + JOB_HEAD_OF_SECURITY + " equipment" contains = list( /obj/item/clothing/head/helmet/HoS, /obj/item/clothing/suit/storage/vest/hos, @@ -598,7 +598,7 @@ ) cost = 50 containertype = /obj/structure/closet/crate/secure/nanotrasen - containername = "Head of security equipment" + containername = JOB_HEAD_OF_SECURITY + " equipment" access = access_hos /datum/supply_pack/security/securityclothing diff --git a/code/game/antagonist/mutiny/mutineer.dm b/code/game/antagonist/mutiny/mutineer.dm index 85aecd71ea..b679c3c0f4 100644 --- a/code/game/antagonist/mutiny/mutineer.dm +++ b/code/game/antagonist/mutiny/mutineer.dm @@ -6,7 +6,7 @@ var/datum/antagonist/mutineer/mutineers role_text_plural = "Mutineers" id = MODE_MUTINEER antag_indicator = "mutineer" - restricted_jobs = list("Site Manager") + restricted_jobs = list(JOB_SITE_MANAGER) /datum/antagonist/mutineer/New(var/no_reference) ..() @@ -39,7 +39,7 @@ var/datum/antagonist/mutineer/mutineers proc/get_head_loyalist_candidates() var/list/candidates[0] for(var/mob/loyalist in player_list) - if(loyalist.mind && loyalist.mind.assigned_role == "Site Manager") + if(loyalist.mind && loyalist.mind.assigned_role == JOB_SITE_MANAGER) candidates.Add(loyalist.mind) return candidates @@ -47,7 +47,7 @@ var/datum/antagonist/mutineer/mutineers var/list/candidates[0] for(var/mob/mutineer in player_list) if(mutineer.client.prefs.be_special & BE_MUTINEER) - for(var/job in command_positions - "Site Manager") + for(var/job in command_positions - JOB_SITE_MANAGER) if(mutineer.mind && mutineer.mind.assigned_role == job) candidates.Add(mutineer.mind) return candidates diff --git a/code/game/antagonist/outsider/ert.dm b/code/game/antagonist/outsider/ert.dm index f1d1aeee4f..09aa113606 100644 --- a/code/game/antagonist/outsider/ert.dm +++ b/code/game/antagonist/outsider/ert.dm @@ -14,7 +14,7 @@ var/datum/antagonist/ert/ert and before taking extreme actions, please try to also contact the administration! \ Think through your actions and make the roleplay immersive! Please remember all \ rules aside from those without explicit exceptions apply to the ERT." - leader_welcome_text = "As leader of the Emergency Response Team, you answer only to the Company, and have authority to override the Site Manager where it is necessary to achieve your mission goals. It is recommended that you attempt to cooperate with the Site Manager where possible, however." + leader_welcome_text = "As leader of the Emergency Response Team, you answer only to the Company, and have authority to override the " + JOB_SITE_MANAGER + " where it is necessary to achieve your mission goals. It is recommended that you attempt to cooperate with the " + JOB_SITE_MANAGER + " where possible, however." landmark_id = "Response Team" id_type = /obj/item/weapon/card/id/centcom/ERT diff --git a/code/game/antagonist/station/changeling.dm b/code/game/antagonist/station/changeling.dm index 2c1cb77f26..e82fac7c8e 100644 --- a/code/game/antagonist/station/changeling.dm +++ b/code/game/antagonist/station/changeling.dm @@ -6,7 +6,7 @@ bantype = "changeling" feedback_tag = "changeling_objective" avoid_silicons = TRUE - protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Site Manager") + protected_jobs = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_HEAD_OF_SECURITY, JOB_SITE_MANAGER) welcome_text = "Use say \"#g message\" to communicate with your fellow changelings. Remember: you get all of their absorbed DNA if you absorb them." antag_sound = 'sound/effects/antag_notice/ling_alert.ogg' flags = ANTAG_SUSPICIOUS | ANTAG_RANDSPAWN | ANTAG_VOTABLE diff --git a/code/game/antagonist/station/cultist.dm b/code/game/antagonist/station/cultist.dm index 57271900b1..666680eab8 100644 --- a/code/game/antagonist/station/cultist.dm +++ b/code/game/antagonist/station/cultist.dm @@ -13,8 +13,8 @@ var/datum/antagonist/cultist/cult bantype = "cultist" restricted_jobs = list("Chaplain") avoid_silicons = TRUE - protected_jobs = list("Security Officer", "Warden", "Detective", "Internal Affairs Agent", "Head of Security", "Site Manager") - roundstart_restricted = list("Internal Affairs Agent", "Head of Security", "Site Manager") + protected_jobs = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, "Internal Affairs Agent", JOB_HEAD_OF_SECURITY, JOB_SITE_MANAGER) + roundstart_restricted = list("Internal Affairs Agent", JOB_HEAD_OF_SECURITY, JOB_SITE_MANAGER) role_type = BE_CULTIST feedback_tag = "cult_objective" antag_indicator = "cult" diff --git a/code/game/antagonist/station/infiltrator.dm b/code/game/antagonist/station/infiltrator.dm index f3e7f8a149..03df6e13d4 100644 --- a/code/game/antagonist/station/infiltrator.dm +++ b/code/game/antagonist/station/infiltrator.dm @@ -11,7 +11,7 @@ var/datum/antagonist/traitor/infiltrator/infiltrators role_text = "Infiltrator" role_text_plural = "Infiltrators" welcome_text = "To speak on your team's private channel, use :t." - protected_jobs = list("Security Officer", "Warden", "Detective", "Internal Affairs Agent", "Head of Security", "Site Manager") + protected_jobs = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, "Internal Affairs Agent", JOB_HEAD_OF_SECURITY, JOB_SITE_MANAGER) flags = ANTAG_SUSPICIOUS | ANTAG_RANDSPAWN | ANTAG_VOTABLE can_speak_aooc = TRUE diff --git a/code/game/antagonist/station/revolutionary.dm b/code/game/antagonist/station/revolutionary.dm index 8f6a7c79e9..d8b2f8994e 100644 --- a/code/game/antagonist/station/revolutionary.dm +++ b/code/game/antagonist/station/revolutionary.dm @@ -30,8 +30,8 @@ var/datum/antagonist/revolutionary/revs faction_invisible = 1 avoid_silicons = TRUE - protected_jobs = list("Security Officer", "Warden", "Detective", "Internal Affairs Agent", "Site Manager", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer") - roundstart_restricted = list("Internal Affairs Agent", "Site Manager", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer") + protected_jobs = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, "Internal Affairs Agent", JOB_SITE_MANAGER, JOB_HEAD_OF_PERSONNEL, JOB_HEAD_OF_SECURITY, "Chief Engineer", "Research Director", "Chief Medical Officer") + roundstart_restricted = list("Internal Affairs Agent", JOB_SITE_MANAGER, JOB_HEAD_OF_PERSONNEL, JOB_HEAD_OF_SECURITY, "Chief Engineer", "Research Director", "Chief Medical Officer") /datum/antagonist/revolutionary/New() ..() diff --git a/code/game/antagonist/station/traitor.dm b/code/game/antagonist/station/traitor.dm index 41b9793330..0258444043 100644 --- a/code/game/antagonist/station/traitor.dm +++ b/code/game/antagonist/station/traitor.dm @@ -4,7 +4,7 @@ var/datum/antagonist/traitor/traitors /datum/antagonist/traitor id = MODE_TRAITOR antag_sound = 'sound/effects/antag_notice/traitor_alert.ogg' - protected_jobs = list("Security Officer", "Warden", "Detective", "Internal Affairs Agent", "Head of Security", "Site Manager") + protected_jobs = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, "Internal Affairs Agent", JOB_HEAD_OF_SECURITY, JOB_SITE_MANAGER) flags = ANTAG_SUSPICIOUS | ANTAG_RANDSPAWN | ANTAG_VOTABLE can_speak_aooc = FALSE // If they want to plot and plan as this sort of traitor, they'll need to do it ICly. diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index c42df5e5cd..3af944967e 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -903,4 +903,3 @@ var/global/list/all_objectives = list() rval = 2 return 0 return rval - diff --git a/code/game/jobs/access_datum.dm b/code/game/jobs/access_datum.dm index 530e450270..810c669754 100644 --- a/code/game/jobs/access_datum.dm +++ b/code/game/jobs/access_datum.dm @@ -343,7 +343,7 @@ var/const/access_explorer = 43 /var/const/access_hos = 58 /datum/access/hos id = access_hos - desc = "Head of Security" + desc = JOB_HEAD_OF_SECURITY region = ACCESS_REGION_SECURITY /var/const/access_RC_announce = 59 //Request console announcements diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index 2138298e6d..73a94278ce 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -5,7 +5,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) ////////////////////////////////// /datum/job/captain - title = "Site Manager" + title = JOB_SITE_MANAGER flag = CAPTAIN departments = list(DEPARTMENT_COMMAND) sorting_order = 3 // Above everyone. @@ -25,12 +25,12 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) minimum_character_age = 25 min_age_by_species = list(SPECIES_HUMAN_VATBORN = 14) ideal_character_age = 70 // Old geezer captains ftw - ideal_age_by_species = list(SPECIES_HUMAN_VATBORN = 55) /// Vatborn live shorter, no other race eligible for captain besides human/skrell + ideal_age_by_species = list(SPECIES_HUMAN_VATBORN = 55) /// Vatborn live shorter, no other race eligible for captain besides human/skrell banned_job_species = list(SPECIES_UNATHI, SPECIES_TAJ, SPECIES_DIONA, SPECIES_PROMETHEAN, SPECIES_ZADDAT, "mechanical", "digital") outfit_type = /decl/hierarchy/outfit/job/captain - job_description = "The Site Manager manages the other Command Staff, and through them the rest of the station. Though they have access to everything, \ - they do not understand everything, and are expected to delegate tasks to the appropriate crew member. The Site Manager is expected to \ + job_description = "The " + JOB_SITE_MANAGER + " manages the other Command Staff, and through them the rest of the station. Though they have access to everything, \ + they do not understand everything, and are expected to delegate tasks to the appropriate crew member. The " + JOB_SITE_MANAGER + " is expected to \ have an understanding of Standard Operating Procedure, and is subject to it, and legal action, in the same way as every other crew member." alt_titles = list("Overseer"= /datum/alt_title/overseer) @@ -54,7 +54,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) // Head of Personnel ////////////////////////////////// /datum/job/hop - title = "Head of Personnel" + title = JOB_HEAD_OF_PERSONNEL flag = HOP departments = list(DEPARTMENT_COMMAND, DEPARTMENT_CIVILIAN, DEPARTMENT_CARGO) sorting_order = 2 // Above the QM, below captain. @@ -63,7 +63,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) faction = "Station" total_positions = 1 spawn_positions = 1 - supervisors = "the Site Manager" + supervisors = "the " + JOB_SITE_MANAGER selection_color = "#1D1D4F" req_admin_notify = 1 minimal_player_age = 10 @@ -76,9 +76,9 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) banned_job_species = list(SPECIES_PROMETHEAN, SPECIES_ZADDAT, "digital", SPECIES_DIONA) outfit_type = /decl/hierarchy/outfit/job/hop - job_description = "The 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 Head of Personnel oversees the personal accounts \ - of the crew, including their money and access. If necessary, the Head of Personnel is first in line to assume Acting Command." + 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 \ + 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) access = list(access_security, access_sec_doors, access_brig, access_forensics_lockers, @@ -103,7 +103,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) ////////////////////////////////// /datum/job/secretary - title = "Command Secretary" + title = JOB_COMMAND_SECRETARY flag = BRIDGE departments = list(DEPARTMENT_COMMAND) department_accounts = list(DEPARTMENT_COMMAND) @@ -120,6 +120,5 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) minimal_access = list(access_heads, access_keycard_auth) outfit_type = /decl/hierarchy/outfit/job/secretary - job_description = "A Command Secretary handles paperwork duty for the Heads of Staff, so they can better focus on managing their departments. \ + job_description = "A " + JOB_COMMAND_SECRETARY + " handles paperwork duty for the Heads of Staff, so they can better focus on managing their departments. \ They are not Heads of Staff, and have no real authority." - diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index f06c7dc083..058ffb61c5 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -12,7 +12,7 @@ faction = "Station" total_positions = 2 spawn_positions = 2 - supervisors = "the Head of Personnel" + supervisors = "the " + JOB_HEAD_OF_PERSONNEL selection_color = "#515151" access = list(access_hydroponics, access_bar, access_kitchen) minimal_access = list(access_bar) @@ -40,7 +40,7 @@ faction = "Station" total_positions = 2 spawn_positions = 2 - supervisors = "the Head of Personnel" + supervisors = "the "+ JOB_HEAD_OF_PERSONNEL selection_color = "#515151" access = list(access_hydroponics, access_bar, access_kitchen) minimal_access = list(access_kitchen) @@ -66,7 +66,7 @@ faction = "Station" total_positions = 2 spawn_positions = 2 - supervisors = "the Head of Personnel" + supervisors = "the " + JOB_HEAD_OF_PERSONNEL selection_color = "#515151" access = list(access_hydroponics, access_bar, access_kitchen) minimal_access = list(access_hydroponics) @@ -94,7 +94,7 @@ faction = "Station" total_positions = 1 spawn_positions = 1 - supervisors = "the Head of Personnel" + supervisors = "the " + JOB_HEAD_OF_PERSONNEL selection_color = "#9b633e" economic_modifier = 5 access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mining, access_mining_station, access_RC_announce) @@ -122,7 +122,7 @@ faction = "Station" total_positions = 2 spawn_positions = 2 - supervisors = "the Quartermaster and the Head of Personnel" + supervisors = "the 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) @@ -136,21 +136,21 @@ ////////////////////////////////// /datum/job/mining - title = "Shaft Miner" + title = JOB_SHAFT_MINER flag = MINER departments = list(DEPARTMENT_CARGO) department_flag = CIVILIAN faction = "Station" total_positions = 3 spawn_positions = 3 - supervisors = "the Quartermaster and the Head of Personnel" + supervisors = "the Quartermaster and the " + JOB_HEAD_OF_PERSONNEL selection_color = "#7a4f33" economic_modifier = 5 access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_mining, access_mining_station) minimal_access = list(access_mining, access_mining_station, access_mailsorting) outfit_type = /decl/hierarchy/outfit/job/cargo/mining - job_description = "A Shaft Miner mines and processes minerals to be delivered to departments that need them." + job_description = "A " + JOB_SHAFT_MINER + " mines and processes minerals to be delivered to departments that need them." alt_titles = list("Drill Technician" = /datum/alt_title/drill_tech) /datum/alt_title/drill_tech @@ -169,7 +169,7 @@ faction = "Station" total_positions = 2 spawn_positions = 2 - supervisors = "the Head of Personnel" + supervisors = "the " + JOB_HEAD_OF_PERSONNEL selection_color = "#515151" access = list(access_janitor, access_maint_tunnels) minimal_access = list(access_janitor, access_maint_tunnels) @@ -194,7 +194,7 @@ faction = "Station" total_positions = 1 spawn_positions = 1 - supervisors = "the Head of Personnel" + supervisors = "the " + JOB_HEAD_OF_PERSONNEL selection_color = "#515151" access = list(access_library, access_maint_tunnels) minimal_access = list(access_library) diff --git a/code/game/jobs/job/civilian_chaplain.dm b/code/game/jobs/job/civilian_chaplain.dm index ca37931412..8922c829b4 100644 --- a/code/game/jobs/job/civilian_chaplain.dm +++ b/code/game/jobs/job/civilian_chaplain.dm @@ -7,7 +7,7 @@ faction = "Station" total_positions = 1 spawn_positions = 1 - supervisors = "the Head of Personnel" + supervisors = "the " + JOB_HEAD_OF_PERSONNEL selection_color = "#515151" access = list(access_morgue, access_chapel_office, access_crematorium, access_maint_tunnels) minimal_access = list(access_chapel_office, access_crematorium) diff --git a/code/game/jobs/job/civilian_vr.dm b/code/game/jobs/job/civilian_vr.dm index 9934d9dea9..be5932cb73 100644 --- a/code/game/jobs/job/civilian_vr.dm +++ b/code/game/jobs/job/civilian_vr.dm @@ -218,7 +218,7 @@ faction = "Station" total_positions = 2 spawn_positions = 2 - supervisors = "the Head of Personnel" + supervisors = "the " + JOB_HEAD_OF_PERSONNEL selection_color = "#515151" economic_modifier = 5 minimal_player_age = 3 @@ -254,7 +254,7 @@ faction = "Station" total_positions = 4 spawn_positions = 4 - supervisors = "the Head of Personnel" + supervisors = "the " + JOB_HEAD_OF_PERSONNEL selection_color = "#515151" access = list(access_entertainment) minimal_access = list(access_entertainment) @@ -324,7 +324,7 @@ faction = "Station" total_positions = 4 spawn_positions = 4 - supervisors = "the Head of Personnel" + supervisors = "the " + JOB_HEAD_OF_PERSONNEL selection_color = "#515151" access = list() minimal_access = list() diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index cd8729e702..e5ae6973a3 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -11,7 +11,7 @@ faction = "Station" total_positions = 1 spawn_positions = 1 - supervisors = "the Site Manager" + supervisors = "the "+ JOB_SITE_MANAGER selection_color = "#7F6E2C" req_admin_notify = 1 economic_modifier = 10 diff --git a/code/game/jobs/job/exploration_vr.dm b/code/game/jobs/job/exploration_vr.dm index 6390e6d5b5..14bb3c46fd 100644 --- a/code/game/jobs/job/exploration_vr.dm +++ b/code/game/jobs/job/exploration_vr.dm @@ -36,7 +36,7 @@ faction = "Station" total_positions = 1 spawn_positions = 1 - supervisors = "the Head of Personnel" + supervisors = "the " + JOB_HEAD_OF_PERSONNEL selection_color = "#d6d05c" economic_modifier = 8 minimal_player_age = 7 @@ -66,7 +66,7 @@ faction = "Station" total_positions = 3 spawn_positions = 3 - supervisors = "the Pathfinder and the Head of Personnel" + supervisors = "the Pathfinder and the " + JOB_HEAD_OF_PERSONNEL selection_color = "#999440" economic_modifier = 6 pto_type = PTO_EXPLORATION diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index f896bf978f..0d65209732 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -11,7 +11,7 @@ faction = "Station" total_positions = 1 spawn_positions = 1 - supervisors = "the Site Manager" + supervisors = "the " + JOB_SITE_MANAGER selection_color = "#026865" req_admin_notify = 1 economic_modifier = 10 @@ -201,4 +201,4 @@ title = "Emergency Medical Technician" title_blurb = "An Emergency Medical Technician is primarily concerned with the recovery of patients who are unable to make it to the Medical Department on their \ own. They are capable of keeping a patient stabilized until they reach the hands of someone with more training." - title_outfit = /decl/hierarchy/outfit/job/medical/paramedic/emt \ No newline at end of file + title_outfit = /decl/hierarchy/outfit/job/medical/paramedic/emt diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index 240b985967..a75d5770d1 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -11,7 +11,7 @@ faction = "Station" total_positions = 1 spawn_positions = 1 - supervisors = "the Site Manager" + supervisors = "the " + JOB_SITE_MANAGER selection_color = "#AD6BAD" req_admin_notify = 1 economic_modifier = 15 diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index 2f6b4ee655..0ceaf623bb 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -2,7 +2,7 @@ // Head of Security ////////////////////////////////// /datum/job/hos - title = "Head of Security" + title = JOB_HEAD_OF_SECURITY flag = HOS departments_managed = list(DEPARTMENT_SECURITY) departments = list(DEPARTMENT_SECURITY, DEPARTMENT_COMMAND) @@ -11,7 +11,7 @@ faction = "Station" total_positions = 1 spawn_positions = 1 - supervisors = "the Site Manager" + supervisors = "the " + JOB_SITE_MANAGER selection_color = "#8E2929" req_admin_notify = 1 economic_modifier = 10 @@ -31,7 +31,7 @@ banned_job_species = list(SPECIES_TESHARI, SPECIES_DIONA, SPECIES_PROMETHEAN, SPECIES_ZADDAT, "digital", SPECIES_UNATHI, "mechanical") outfit_type = /decl/hierarchy/outfit/job/security/hos - job_description = " The Head of Security manages the Security Department, keeping the station safe and making sure the rules are followed. They are expected to \ + job_description = " The " + JOB_HEAD_OF_SECURITY + " manages the Security Department, keeping the station safe and making sure the rules are followed. They are expected to \ keep the other Department Heads, and the rest of the crew, aware of developing situations that may be a threat. If necessary, the HoS may \ perform the duties of absent Security roles, such as distributing gear from the Armory." alt_titles = list("Security Commander" = /datum/alt_title/sec_commander, "Chief of Security" = /datum/alt_title/sec_chief) @@ -48,7 +48,7 @@ // Warden ////////////////////////////////// /datum/job/warden - title = "Warden" + title = JOB_WARDEN flag = WARDEN departments = list(DEPARTMENT_SECURITY) sorting_order = 1 @@ -56,7 +56,7 @@ faction = "Station" total_positions = 1 spawn_positions = 1 - supervisors = "the Head of Security" + supervisors = "the " + JOB_HEAD_OF_SECURITY selection_color = "#601C1C" economic_modifier = 5 access = list(access_security, access_eva, access_sec_doors, access_brig, access_armory, access_maint_tunnels, access_morgue, access_external_airlocks) @@ -65,23 +65,23 @@ banned_job_species = list(SPECIES_ZADDAT, SPECIES_PROMETHEAN, SPECIES_TESHARI, SPECIES_DIONA) outfit_type = /decl/hierarchy/outfit/job/security/warden - job_description = "The Warden watches over the physical Security Department, making sure the Brig and Armoury are secure and in order at all times. They oversee \ - prisoners that have been processed and brigged, and are responsible for their well being. The Warden is also in charge of distributing \ - Armoury gear in a crisis, and retrieving it when the crisis has passed. In an emergency, the Warden may be called upon to direct the \ + job_description = "The " + JOB_WARDEN + " watches over the physical Security Department, making sure the Brig and Armoury are secure and in order at all times. They oversee \ + prisoners that have been processed and brigged, and are responsible for their well being. The " + JOB_WARDEN + " is also in charge of distributing \ + Armoury gear in a crisis, and retrieving it when the crisis has passed. In an emergency, the " + JOB_WARDEN + " may be called upon to direct the \ Security Department as a whole." ////////////////////////////////// // Detective ////////////////////////////////// /datum/job/detective - title = "Detective" + title = JOB_DETECTIVE flag = DETECTIVE departments = list(DEPARTMENT_SECURITY) department_flag = ENGSEC faction = "Station" total_positions = 2 spawn_positions = 2 - supervisors = "the Head of Security" + supervisors = "the " + JOB_HEAD_OF_SECURITY selection_color = "#601C1C" access = list(access_security, access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_eva, access_external_airlocks, access_brig) //Vorestation edit - access_brig minimal_access = list(access_security, access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_eva, access_external_airlocks) @@ -90,28 +90,28 @@ banned_job_species = list(SPECIES_ZADDAT, SPECIES_PROMETHEAN, SPECIES_DIONA) outfit_type = /decl/hierarchy/outfit/job/security/detective - job_description = "A Detective works to help Security find criminals who have not properly been identified, through interviews and forensic work. \ + job_description = "A " + JOB_DETECTIVE + " works to help Security find criminals who have not properly been identified, through interviews and forensic work. \ For crimes only witnessed after the fact, or those with no survivors, they attempt to piece together what they can from pure evidence." - alt_titles = list("Forensic Technician" = /datum/alt_title/forensic_tech) + alt_titles = list(JOB_ALT_FORENSIC_TECHNICIAN = /datum/alt_title/forensic_tech) // Detective Alt Titles /datum/alt_title/forensic_tech - title = "Forensic Technician" - title_blurb = "A Forensic Technician works more with hard evidence and labwork than a Detective, but they share the purpose of solving crimes." + title = JOB_ALT_FORENSIC_TECHNICIAN + title_blurb = "A " + JOB_ALT_FORENSIC_TECHNICIAN + " works more with hard evidence and labwork than a " + JOB_DETECTIVE + ", but they share the purpose of solving crimes." title_outfit = /decl/hierarchy/outfit/job/security/detective/forensic ////////////////////////////////// // Security Officer ////////////////////////////////// /datum/job/officer - title = "Security Officer" + title = JOB_SECURITY_OFFICER flag = OFFICER departments = list(DEPARTMENT_SECURITY) department_flag = ENGSEC faction = "Station" total_positions = 4 spawn_positions = 4 - supervisors = "the Head of Security" + supervisors = "the " + JOB_HEAD_OF_SECURITY selection_color = "#601C1C" economic_modifier = 4 access = list(access_security, access_eva, access_sec_doors, access_brig, access_maint_tunnels, access_morgue, access_external_airlocks) @@ -120,16 +120,16 @@ banned_job_species = list(SPECIES_ZADDAT, SPECIES_TESHARI, SPECIES_DIONA) outfit_type = /decl/hierarchy/outfit/job/security/officer - job_description = "A Security Officer is concerned with maintaining the safety and security of the station as a whole, dealing with external threats and \ - apprehending criminals. A Security Officer is responsible for the health, safety, and processing of any prisoner they arrest. \ + job_description = "A " + JOB_SECURITY_OFFICER + " is concerned with maintaining the safety and security of the station as a whole, dealing with external threats and \ + apprehending criminals. A " + JOB_SECURITY_OFFICER + " is responsible for the health, safety, and processing of any prisoner they arrest. \ No one is above the Law, not Security or Command." - alt_titles = list("Junior Officer" = /datum/alt_title/junior_officer) + alt_titles = list(JOB_ALT_JUNIOR_OFFICER = /datum/alt_title/junior_officer) min_age_by_species = list(SPECIES_PROMETHEAN = 3) // Security Officer Alt Titles /datum/alt_title/junior_officer - title = "Junior Officer" - title_blurb = "A Junior Officer is an inexperienced Security Officer. They likely have training, but not experience, and are frequently \ + title = JOB_ALT_JUNIOR_OFFICER + title_blurb = "A " + JOB_ALT_JUNIOR_OFFICER + " is an inexperienced " + JOB_SECURITY_OFFICER + ". They likely have training, but not experience, and are frequently \ paired off with a more senior co-worker. Junior Officers may also be expected to take over the boring duties of other Officers \ - including patrolling the station or maintaining specific posts." \ No newline at end of file + including patrolling the station or maintaining specific posts." diff --git a/code/game/jobs/job/security_vr.dm b/code/game/jobs/job/security_vr.dm index 8980381d6a..00ffc6149b 100644 --- a/code/game/jobs/job/security_vr.dm +++ b/code/game/jobs/job/security_vr.dm @@ -40,7 +40,7 @@ /datum/job/detective pto_type = PTO_SECURITY - alt_titles = list("Investigator" = /datum/alt_title/investigator, "Security Inspector" = /datum/alt_title/security_inspector, "Forensic Technician" = /datum/alt_title/forensic_tech) + alt_titles = list("Investigator" = /datum/alt_title/investigator, "Security Inspector" = /datum/alt_title/security_inspector, JOB_ALT_FORENSIC_TECHNICIAN = /datum/alt_title/forensic_tech) /datum/alt_title/investigator title = "Investigator" @@ -57,7 +57,7 @@ spawn_positions = 5 pto_type = PTO_SECURITY alt_titles = list("Patrol Officer" = /datum/alt_title/patrol_officer, "Security Guard" = /datum/alt_title/security_guard, - "Security Deputy" = /datum/alt_title/security_guard, "Junior Officer" = /datum/alt_title/junior_officer, "Security Contractor" = /datum/alt_title/security_contractor) + "Security Deputy" = /datum/alt_title/security_guard, JOB_ALT_JUNIOR_OFFICER = /datum/alt_title/junior_officer, "Security Contractor" = /datum/alt_title/security_contractor) /datum/alt_title/patrol_officer title = "Patrol Officer" diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index 4ce8780cf4..33fa4e7b3f 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -495,9 +495,9 @@ var/global/datum/controller/occupations/job_master return H // TWEET PEEP - if(rank == "Site Manager") + if(rank == JOB_SITE_MANAGER) var/sound/announce_sound = (ticker.current_state <= GAME_STATE_SETTING_UP) ? null : sound('sound/misc/boatswain.ogg', volume=20) - captain_announcement.Announce("All hands, [alt_title ? alt_title : "Site Manager"] [H.real_name] on deck!", new_sound = announce_sound, zlevel = H.z) + captain_announcement.Announce("All hands, [alt_title ? alt_title : JOB_SITE_MANAGER] [H.real_name] on deck!", new_sound = announce_sound, zlevel = H.z) //Deferred item spawning. if(spawn_in_storage && spawn_in_storage.len) diff --git a/code/game/machinery/computer3/computers/card.dm b/code/game/machinery/computer3/computers/card.dm index 8f6c57b6d6..32984180ba 100644 --- a/code/game/machinery/computer3/computers/card.dm +++ b/code/game/machinery/computer3/computers/card.dm @@ -36,7 +36,7 @@ jobs_all += "" jobs_all += ""//Site Manager in special because he is head of heads ~Intercross21 - jobs_all += "" + jobs_all += "" jobs_all += "" counter = 0 diff --git a/code/game/objects/effects/job_start_landmarks.dm b/code/game/objects/effects/job_start_landmarks.dm index 93abb2bc0d..df670774db 100644 --- a/code/game/objects/effects/job_start_landmarks.dm +++ b/code/game/objects/effects/job_start_landmarks.dm @@ -1,17 +1,17 @@ /obj/effect/landmark/start/captain - name = "Site Manager" + name = JOB_SITE_MANAGER /obj/effect/landmark/start/hop - name = "Head of Personnel" + name = JOB_HEAD_OF_PERSONNEL /obj/effect/landmark/start/commandsecretary - name = "Command Secretary" + name = JOB_COMMAND_SECRETARY /obj/effect/landmark/start/hos - name = "Head of Security" + name = JOB_HEAD_OF_SECURITY /obj/effect/landmark/start/warden - name = "Warden" + name = JOB_WARDEN /obj/effect/landmark/start/detective - name = "Detective" + name = JOB_DETECTIVE /obj/effect/landmark/start/security - name = "Security Officer" + name = JOB_SECURITY_OFFICER /obj/effect/landmark/start/ce name = "Chief Engineer" /obj/effect/landmark/start/atmostech @@ -43,7 +43,7 @@ /obj/effect/landmark/start/cargo name = "Cargo Technician" /obj/effect/landmark/start/miner - name = "Shaft Miner" + name = JOB_SHAFT_MINER /* //VOREStation Removal /obj/effect/landmark/start/pf name = "Pathfinder" diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 49a4dab9b4..6cf3679c7b 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -258,13 +258,13 @@ /obj/item/device/radio/headset/heads/hop name = "head of personnel's headset" - desc = "The headset of the poor fool who will one day be Site Manager." + desc = "The headset of the poor fool who will one day be " + JOB_SITE_MANAGER + "." icon_state = "com_headset" ks2type = /obj/item/device/encryptionkey/heads/hop /obj/item/device/radio/headset/heads/hop/alt name = "head of personnel's bowman headset" - desc = "The headset of the poor fool who will one day be Site Manager." + desc = "The headset of the poor fool who will one day be " + JOB_SITE_MANAGER + "." icon_state = "com_headset_alt" ks2type = /obj/item/device/encryptionkey/heads/hop diff --git a/code/game/objects/items/toys/toys.dm b/code/game/objects/items/toys/toys.dm index 9dadaff977..06f657909a 100644 --- a/code/game/objects/items/toys/toys.dm +++ b/code/game/objects/items/toys/toys.dm @@ -347,8 +347,8 @@ toysay = "Dude, I see colors..." /obj/item/toy/figure/captain - name = "Site Manager action figure" - desc = "A \"Space Life\" brand Site Manager action figure." + name = JOB_SITE_MANAGER + " action figure" + desc = "A \"Space Life\" brand " + JOB_SITE_MANAGER + " action figure." icon_state = "captain" toysay = "How do I open this display case?" @@ -395,8 +395,8 @@ toysay = "Arf!" /obj/item/toy/figure/detective - name = "Detective action figure" - desc = "A \"Space Life\" brand Detective action figure." + name = JOB_DETECTIVE + " action figure" + desc = "A \"Space Life\" brand " + JOB_DETECTIVE + " action figure." icon_state = "detective" toysay = "This airlock has grey jumpsuit and insulated glove fibers on it." @@ -419,14 +419,14 @@ toysay = "I'm not qualified for this job." /obj/item/toy/figure/hop - name = "Head of Personnel action figure" - desc = "A \"Space Life\" brand Head of Personnel action figure." + name = JOB_HEAD_OF_PERSONNEL + " action figure" + desc = "A \"Space Life\" brand " + JOB_HEAD_OF_PERSONNEL + " action figure." icon_state = "hop" toysay = "Giving out all access!" /obj/item/toy/figure/hos - name = "Head of Security action figure" - desc = "A \"Space Life\" brand Head of Security action figure." + name = JOB_HEAD_OF_SECURITY + " action figure" + desc = "A \"Space Life\" brand " + JOB_HEAD_OF_SECURITY + " action figure." icon_state = "hos" toysay = "I'm here to win, anything else is secondary." @@ -467,8 +467,8 @@ toysay = "..." /obj/item/toy/figure/miner - name = "Shaft Miner action figure" - desc = "A \"Space Life\" brand Shaft Miner action figure." + name = JOB_SHAFT_MINER + " action figure" + desc = "A \"Space Life\" brand " + JOB_SHAFT_MINER + " action figure." icon_state = "miner" toysay = "Oh god, it's eating my intestines!" @@ -509,8 +509,8 @@ toysay = "Get that fucking disk!" /obj/item/toy/figure/secofficer - name = "Security Officer action figure" - desc = "A \"Space Life\" brand Security Officer action figure." + name = JOB_SECURITY_OFFICER + " action figure" + desc = "A \"Space Life\" brand " + JOB_SECURITY_OFFICER + " action figure." icon_state = "secofficer" toysay = "I am the law!" @@ -521,8 +521,8 @@ toysay = "The cure is potassium!" /obj/item/toy/figure/warden - name = "Warden action figure" - desc = "A \"Space Life\" brand Warden action figure." + name = JOB_WARDEN + " action figure" + desc = "A \"Space Life\" brand " + JOB_WARDEN + " action figure." icon_state = "warden" toysay = "Execute him for breaking in!" diff --git a/code/game/objects/items/toys/toys_vr.dm b/code/game/objects/items/toys/toys_vr.dm index e492f3e178..4375a36132 100644 --- a/code/game/objects/items/toys/toys_vr.dm +++ b/code/game/objects/items/toys/toys_vr.dm @@ -539,7 +539,7 @@ continue players += player.real_name - var/random_player = "The Site Manager" + var/random_player = "The " + JOB_SITE_MANAGER if(cooldown < world.time) cooldown = (world.time + 300) // Sets cooldown at 30 seconds if(players.len) diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm index ceafb06c73..d2cf40f0de 100644 --- a/code/game/objects/items/weapons/dna_injector.dm +++ b/code/game/objects/items/weapons/dna_injector.dm @@ -158,7 +158,7 @@ /obj/item/weapon/dnainjector/xraymut name = "\improper DNA injector (Xray)" - desc = "Finally you can see what the Site Manager does." + desc = "Finally you can see what the " + JOB_SITE_MANAGER + " does." datatype = DNA2_BUF_SE value = 0xFFF diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm index d407e91cd7..aa319216d7 100644 --- a/code/game/objects/items/weapons/grenades/flashbang.dm +++ b/code/game/objects/items/weapons/grenades/flashbang.dm @@ -99,7 +99,7 @@ /obj/item/weapon/grenade/flashbang/clusterbang//Created by Polymorph, fixed by Sieve - desc = "Use of this weapon may constiute a war crime in your area, consult your local Site Manager." + desc = "Use of this weapon may constiute a war crime in your area, consult your local " + JOB_SITE_MANAGER + "." name = "clusterbang" icon = 'icons/obj/grenade.dmi' icon_state = "clusterbang" @@ -162,4 +162,4 @@ var/dettime = rand(15,60) spawn(dettime) - detonate() \ No newline at end of file + detonate() diff --git a/code/game/objects/items/weapons/id cards/cards.dm b/code/game/objects/items/weapons/id cards/cards.dm index 3b1436a12f..91c5ba3a4b 100644 --- a/code/game/objects/items/weapons/id cards/cards.dm +++ b/code/game/objects/items/weapons/id cards/cards.dm @@ -273,7 +273,7 @@ var/mob/living/silicon/robot/R var/last_robot_loc name = "Robot Miner ID" - rank = "Shaft Miner" + rank = JOB_SHAFT_MINER /obj/item/weapon/card/id/cargo/miner/borg/Initialize() . = ..() 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 e3dc53bfe8..9dab9e9c92 100644 --- a/code/game/objects/items/weapons/id cards/id_stacks.dm +++ b/code/game/objects/items/weapons/id cards/id_stacks.dm @@ -58,10 +58,12 @@ /obj/item/weapon/card/id/silver/secretary name = "Secretary's ID" initial_sprite_stack = list("base-stamp", "top-blue", "stamp-n") + rank = JOB_COMMAND_SECRETARY /obj/item/weapon/card/id/silver/hop - name = "Head of Personnel ID" + name = JOB_HEAD_OF_PERSONNEL + " ID" initial_sprite_stack = list("base-stamp-silver", "top-blue", "stamp-n", "pips-gold") + rank = JOB_HEAD_OF_PERSONNEL //Gold @@ -76,6 +78,7 @@ /obj/item/weapon/card/id/gold/captain/spare name = "Spare ID" initial_sprite_stack = list("base-stamp-gold", "top-gold", "stamp-n") + rank = JOB_SITE_MANAGER //Medical @@ -112,18 +115,22 @@ /obj/item/weapon/card/id/security name = "Security ID" initial_sprite_stack = list("base-stamp", "top-red", "stamp-n") + rank = JOB_SECURITY_OFFICER /obj/item/weapon/card/id/security/detective - name = "Detective's ID" + name = JOB_DETECTIVE + "'s ID" initial_sprite_stack = list("base-stamp", "top-red", "stamp-n", "stripe-brown") + rank = JOB_DETECTIVE /obj/item/weapon/card/id/security/warden - name = "Warden's ID" + name = JOB_WARDEN + "'s ID" initial_sprite_stack = list("base-stamp", "top-red", "stamp-n", "stripe-white") + rank = JOB_WARDEN /obj/item/weapon/card/id/security/head - name = "Head of Security's ID" + name = JOB_HEAD_OF_SECURITY + "'s ID" initial_sprite_stack = list("base-stamp-silver", "top-red", "stamp-n", "pips-gold") + rank = JOB_HEAD_OF_SECURITY //Engineering @@ -170,6 +177,7 @@ /obj/item/weapon/card/id/cargo/miner name = "Miner's ID" initial_sprite_stack = list("base-stamp", "top-brown", "stamp-n", "stripe-purple") + rank = JOB_SHAFT_MINER /obj/item/weapon/card/id/cargo/head name = "Quartermaster's ID" 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 a38d341a6a..c07cf1e298 100644 --- a/code/game/objects/items/weapons/id cards/station_ids.dm +++ b/code/game/objects/items/weapons/id cards/station_ids.dm @@ -142,14 +142,14 @@ preserve_item = 1 /obj/item/weapon/card/id/gold/captain - assignment = "Site Manager" - rank = "Site Manager" + assignment = JOB_SITE_MANAGER + rank = JOB_SITE_MANAGER /obj/item/weapon/card/id/gold/captain/spare - name = "\improper Site Manager's spare ID" + name = "\improper " + JOB_SITE_MANAGER + "'s spare ID" desc = "The emergency spare ID for the station's very own Big Cheese." icon_state = "gold-id-alternate" - registered_name = "Site Manager" + registered_name = JOB_SITE_MANAGER /obj/item/weapon/card/id/gold/captain/spare/fakespare rank = "null" @@ -233,18 +233,19 @@ icon_state = "security-id" primary_color = rgb(189,47,0) secondary_color = rgb(223,127,95) + rank = JOB_SECURITY_OFFICER /obj/item/weapon/card/id/security/warden - assignment = "Warden" - rank = "Warden" + assignment = JOB_WARDEN + rank = JOB_WARDEN /obj/item/weapon/card/id/security/head name = "identification card" desc = "A card which represents honor and protection." primary_color = rgb(189,47,0) secondary_color = rgb(255,223,127) - assignment = "Head of Security" - rank = "Head of Security" + assignment = JOB_HEAD_OF_SECURITY + rank = JOB_HEAD_OF_SECURITY /obj/item/weapon/card/id/engineering name = "identification card" @@ -524,7 +525,7 @@ "Visitor" = "itg", "Quartermaster" = "itg", "Cargo Technician" = "itg", - "Shaft Miner" = "itg", + JOB_SHAFT_MINER = "itg", "Intern" = "itg", "Talon Pilot" = "itg", "Talon Miner" = "itg", @@ -536,9 +537,9 @@ "Entertainer" = "itg_green", "Janitor" = "itg_green", "Librarian" = "itg_green", - "Warden" = "itg_red", - "Detective" = "itg_red", - "Security Officer" = "itg_red", + JOB_WARDEN = "itg_red", + JOB_DETECTIVE = "itg_red", + JOB_SECURITY_OFFICER = "itg_red", "Talon Guard" = "itg_red", "Roboticist" = "itg_purple", "Scientist" = "itg_purple", @@ -577,7 +578,7 @@ /obj/item/weapon/card/id/event/polymorphic/itg/attackby(obj/item/I as obj, var/mob/user) if(istype(I, /obj/item/weapon/card/id) && !accessset) var/obj/item/weapon/card/id/O = I - var/list/itgdont = list("Site Manager", "Head of Personnel", "Command Secretary", "Head of Security", "Chief Engineer", "Chief Medical Officer", "Research Director", "Clown", "Mime", "Talon Captain") //If you're in as one of these you probably aren't representing ITG + var/list/itgdont = list(JOB_SITE_MANAGER, JOB_HEAD_OF_PERSONNEL, JOB_COMMAND_SECRETARY, "Head of Security", "Chief Engineer", "Chief Medical Officer", "Research Director", "Clown", "Mime", "Talon Captain") //If you're in as one of these you probably aren't representing ITG if(O.rank in itgdont) to_chat(user, "ITG Cards do not seem to be able to accept the access codes for your ID.") return diff --git a/code/game/response_team.dm b/code/game/response_team.dm index 99d6843da8..4d229aa903 100644 --- a/code/game/response_team.dm +++ b/code/game/response_team.dm @@ -53,7 +53,7 @@ var/silent_ert = 0 if(!send_emergency_team) to_chat(usr, "No emergency response team is currently being sent.") return - if(jobban_isbanned(usr, "Syndicate") || jobban_isbanned(usr, "Emergency Response Team") || jobban_isbanned(usr, "Security Officer")) + if(jobban_isbanned(usr, "Syndicate") || jobban_isbanned(usr, "Emergency Response Team") || jobban_isbanned(usr, JOB_SECURITY_OFFICER)) to_chat(usr, "You are jobbanned from the emergency reponse team!") return if(ert.current_antagonists.len >= ert.hard_cap) diff --git a/code/modules/admin/newbanjob.dm b/code/modules/admin/newbanjob.dm index f495ddb5c0..d4a238f9d1 100644 --- a/code/modules/admin/newbanjob.dm +++ b/code/modules/admin/newbanjob.dm @@ -62,18 +62,18 @@ var/savefile/Banlistjob UpdateTime() bantimestamp = CMinutes + minutes if(rank == "Heads") - AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Head of Personnel") - AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Site Manager") - AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Head of Security") + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_HEAD_OF_PERSONNEL) + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_SITE_MANAGER) + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_HEAD_OF_SECURITY) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chief Engineer") AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Research Director") AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chief Medical Officer") return 1 if(rank == "Security") - AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Head of Security") - AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Warden") - AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Detective") - AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Security Officer") + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_HEAD_OF_SECURITY) + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_WARDEN) + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_DETECTIVE) + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_SECURITY_OFFICER) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Cyborg") return 1 if(rank == "Engineering") @@ -104,7 +104,7 @@ var/savefile/Banlistjob AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chief Engineer") return 1 if(rank == "CE_Shaft_Miner") - AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Shaft Miner") + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_SHAFT_MINER) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chief Engineer") return 1 if(rank == "Chemist_RD_CMO") @@ -130,8 +130,8 @@ var/savefile/Banlistjob AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "AI") return 1 if(rank == "Detective_HoS") - AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Detective") - AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Head of Security") + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_DETECTIVE) + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_HEAD_OF_SECURITY) return 1 if(rank == "Virologist_RD_CMO") AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chief Medical Officer") diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 0cb7504ca4..da324fbfb0 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -293,7 +293,7 @@ id.icon_state = "gold" id.access = get_all_accesses().Copy() id.registered_name = H.real_name - id.assignment = "Site Manager" + id.assignment = JOB_SITE_MANAGER id.name = "[id.registered_name]'s ID Card ([id.assignment])" H.equip_to_slot_or_del(id, slot_wear_id) H.update_inv_wear_id() diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index b3ab39f74e..909b2fa200 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -204,7 +204,7 @@ corpseidaccess = "Scientist" /obj/effect/landmark/corpse/security - name = "Security Officer" + name = JOB_SECURITY_OFFICER corpseradio = /obj/item/device/radio/headset/headset_sec corpseuniform = /obj/item/clothing/under/rank/security corpsesuit = /obj/item/clothing/suit/armor/vest @@ -214,8 +214,8 @@ corpsegloves = /obj/item/clothing/gloves/black corpsehelmet = /obj/item/clothing/head/helmet corpseid = 1 - corpseidjob = "Security Officer" - corpseidaccess = "Security Officer" + corpseidjob = JOB_SECURITY_OFFICER + corpseidaccess = JOB_SECURITY_OFFICER /obj/effect/landmark/corpse/security/rig corpsesuit = /obj/item/clothing/suit/space/void/security @@ -243,8 +243,8 @@ corpseback = /obj/item/weapon/storage/backpack/industrial corpseshoes = /obj/item/clothing/shoes/black corpseid = 1 - corpseidjob = "Shaft Miner" - corpseidaccess = "Shaft Miner" + corpseidjob = JOB_SHAFT_MINER + corpseidaccess = JOB_SHAFT_MINER /obj/effect/landmark/corpse/miner/rig corpsesuit = /obj/item/clothing/suit/space/void/mining @@ -378,4 +378,3 @@ corpseshoes = /obj/item/clothing/shoes/boots/tactical corpseid = 1 corpseidjob = "Hedberg-Hammarstrom Enforcer" - diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index 4bb9d769d6..ca0de08dc4 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -77,7 +77,7 @@ display_name = "holster selection" description = "Select from a number of general-purpose handgun holsters, or a baton lanyard." path = /obj/item/clothing/accessory/holster - allowed_roles = list("Site Manager", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective","Talon Captain","Talon Guard") + allowed_roles = list(JOB_SITE_MANAGER, JOB_HEAD_OF_PERSONNEL, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY,JOB_DETECTIVE,"Talon Captain","Talon Guard") /datum/gear/accessory/holster/New() ..() @@ -335,7 +335,7 @@ /datum/gear/accessory/badge display_name = "sheriff badge (Security)" path = /obj/item/clothing/accessory/badge/holo/sheriff - allowed_roles = list("Security Officer","Detective","Head of Security","Warden") + allowed_roles = list(JOB_SECURITY_OFFICER,JOB_DETECTIVE,JOB_HEAD_OF_SECURITY,JOB_WARDEN) /datum/gear/accessory/corpbadge display_name = "investigator holobadge (IAA)" diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes.dm b/code/modules/client/preference_setup/loadout/loadout_eyes.dm index 91c84f9183..5954f9587f 100644 --- a/code/modules/client/preference_setup/loadout/loadout_eyes.dm +++ b/code/modules/client/preference_setup/loadout/loadout_eyes.dm @@ -71,7 +71,7 @@ display_name = "Security HUD selector" description = "Select from a range of Security HUD eyepieces that can display the ID status and security records of people in line of sight." path = /obj/item/clothing/glasses/hud/security - allowed_roles = list("Security Officer","Head of Security","Warden", "Detective") + allowed_roles = list(JOB_SECURITY_OFFICER,JOB_HEAD_OF_SECURITY,JOB_WARDEN, JOB_DETECTIVE) /datum/gear/eyes/security/New() ..() @@ -133,7 +133,7 @@ /datum/gear/eyes/material display_name = "Optical Material Scanners" path = /obj/item/clothing/glasses/material - allowed_roles = list("Shaft Miner","Quartermaster") + allowed_roles = list(JOB_SHAFT_MINER,"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("Security Officer","Head of Security","Warden","Site Manager","Head of Personnel","Quartermaster","Internal Affairs Agent","Detective") + 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) /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 89aad658ce..65351d357e 100644 --- a/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm @@ -19,7 +19,7 @@ /datum/gear/eyes/arglasses/sec display_name = "AR-Security glasses" path = /obj/item/clothing/glasses/omnihud/sec - allowed_roles = list("Security Officer","Head of Security","Warden","Detective") + allowed_roles = list(JOB_SECURITY_OFFICER,JOB_HEAD_OF_SECURITY,JOB_WARDEN,JOB_DETECTIVE) /datum/gear/eyes/arglasses/sci display_name = "AR-Research glasses" @@ -40,7 +40,7 @@ display_name = "AR-Command glasses" path = /obj/item/clothing/glasses/omnihud/all cost = 2 - allowed_roles = list("Site Manager","Head of Personnel") + allowed_roles = list(JOB_SITE_MANAGER,JOB_HEAD_OF_PERSONNEL) /datum/gear/eyes/spiffygogs display_name = "slick orange goggles" 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 9055d28548..943b16b8e8 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm @@ -536,7 +536,7 @@ // I CKEYS /datum/gear/fluff/ruda_badge path = /obj/item/clothing/accessory/badge/holo/detective/ruda - display_name = "Ruda's Detective Badge" + display_name = "Ruda's " + JOB_DETECTIVE + " Badge" ckeywhitelist = list("interrolouis") character_name = list("Ruda Lizden") @@ -578,7 +578,7 @@ slot = slot_back ckeywhitelist = list("jacknoir413") character_name = list("Areax Third") - allowed_roles = list("Security Officer, Warden, Head of Security") + allowed_roles = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY) /datum/gear/fluff/earthen_uniform path = /obj/item/clothing/under/fluff/earthenbreath @@ -626,7 +626,7 @@ display_name = "Ace's Holster" ckeywhitelist = list("jertheace") character_name = list("Jeremiah Acacius") - allowed_roles = list("Site Manager", "Warden", "Head of Security") + allowed_roles = list(JOB_SITE_MANAGER, JOB_WARDEN, JOB_HEAD_OF_SECURITY) /datum/gear/fluff/jeremiah_boots path = /obj/item/clothing/shoes/boots/combat @@ -654,7 +654,7 @@ display_name = "Katarina's Backpack" ckeywhitelist = list("joanrisu") character_name = list("Katarina Eine") - allowed_roles = list("Site Manager", "Warden", "Head of Security") + allowed_roles = list(JOB_SITE_MANAGER, JOB_WARDEN, JOB_HEAD_OF_SECURITY) /datum/gear/fluff/emoticon_box path = /obj/item/weapon/storage/box/fluff/emoticon @@ -820,7 +820,7 @@ slot = slot_wear_suit ckeywhitelist = list("mrsignmeup") character_name = list("Reshskakskakss Seekiseekis") - allowed_roles = list("Head of Security") + allowed_roles = list(JOB_HEAD_OF_SECURITY) /datum/gear/fluff/daniel_medal path = /obj/item/clothing/accessory/medal/conduct @@ -1091,7 +1091,7 @@ slot = slot_wear_suit ckeywhitelist = list("samanthafyre") character_name = list("Kateryna Petrovitch") - allowed_roles = list("Security Officer", "Warden", "Head of Security", "Site Manager", "Head of Personnel") + allowed_roles = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY, JOB_SITE_MANAGER, JOB_HEAD_OF_PERSONNEL) /datum/gear/fluff/viktor_flask path = /obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask/fluff/viktor @@ -1138,7 +1138,7 @@ display_name = "Cerise's Champion's Belt" ckeywhitelist = list("shalax") character_name = list("Cerise Duelliste") - allowed_roles = list("Security Officer", "Warden", "Head of Security", "Detective") + allowed_roles = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY, JOB_DETECTIVE) /datum/gear/fluff/sidona_robes path = /obj/item/clothing/under/fluff/gildedrobe_perrin @@ -1157,14 +1157,14 @@ display_name = "NT-HASD 556's Modkit" ckeywhitelist = list("silencedmp5a5") character_name = list("NT-HASD #556") - allowed_roles = list("Site Manager", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective") + allowed_roles = list(JOB_SITE_MANAGER, JOB_HEAD_OF_PERSONNEL, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY,JOB_DETECTIVE) /datum/gear/fluff/serdykov_modkit //Also converts a Security suit's sprite path = /obj/item/device/modkit_conversion/fluff/serdykit display_name = "Serdykov Antoz's Modkit" ckeywhitelist = list("silencedmp5a5") character_name = list("Serdykov Antoz") - allowed_roles = list("Site Manager", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective") + allowed_roles = list(JOB_SITE_MANAGER, JOB_HEAD_OF_PERSONNEL, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY,JOB_DETECTIVE) /datum/gear/fluff/tasy_clownuniform path = /obj/item/clothing/under/sexyclown diff --git a/code/modules/client/preference_setup/loadout/loadout_gloves.dm b/code/modules/client/preference_setup/loadout/loadout_gloves.dm index a330027611..859d6a0c4c 100644 --- a/code/modules/client/preference_setup/loadout/loadout_gloves.dm +++ b/code/modules/client/preference_setup/loadout/loadout_gloves.dm @@ -54,7 +54,7 @@ /datum/gear/gloves/forensic display_name = "gloves, forensic" path = /obj/item/clothing/gloves/forensic - allowed_roles = list("Detective") + allowed_roles = list(JOB_DETECTIVE) /datum/gear/gloves/fingerless display_name = "fingerless gloves" diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index 06aebf077f..29648cdb85 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -19,22 +19,22 @@ /datum/gear/head/beret/bsec_warden display_name = "beret, navy (warden)" path = /obj/item/clothing/head/beret/sec/navy/warden - allowed_roles = list("Head of Security","Warden") + allowed_roles = list(JOB_HEAD_OF_SECURITY,JOB_WARDEN) /datum/gear/head/beret/bsec_hos display_name = "beret, navy (hos)" path = /obj/item/clothing/head/beret/sec/navy/hos - allowed_roles = list("Head of Security") + allowed_roles = list(JOB_HEAD_OF_SECURITY) /datum/gear/head/beret/csec_warden display_name = "beret, corporate (warden)" path = /obj/item/clothing/head/beret/sec/corporate/warden - allowed_roles = list("Head of Security","Warden") + allowed_roles = list(JOB_HEAD_OF_SECURITY,JOB_WARDEN) /datum/gear/head/beret/csec_hos display_name = "beret, corporate (hos)" path = /obj/item/clothing/head/beret/sec/corporate/hos - allowed_roles = list("Head of Security") + allowed_roles = list(JOB_HEAD_OF_SECURITY) /datum/gear/head/beret/eng display_name = "beret, engie-orange" @@ -376,7 +376,7 @@ /datum/gear/head/sec_hat_selector display_name = "Security - Basic Headwear" description = "Select from a range of hats available to all Security personnel." - allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer") + allowed_roles = list(JOB_HEAD_OF_SECURITY, JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER) path = /obj/item/clothing/head/soft/sec/corp /datum/gear/head/sec_hat_selector/New() diff --git a/code/modules/client/preference_setup/loadout/loadout_head_vr.dm b/code/modules/client/preference_setup/loadout/loadout_head_vr.dm index 48015f229e..969bb5cb06 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head_vr.dm @@ -25,7 +25,7 @@ /datum/gear/head/detective_alt display_name = "cyberscope headgear, detective" path = /obj/item/clothing/head/helmet/detective_alt - allowed_roles = list("Head of Security", "Detective") + allowed_roles = list(JOB_HEAD_OF_SECURITY, JOB_DETECTIVE) /datum/gear/head/bearpelt display_name = "animal pelt selection" diff --git a/code/modules/client/preference_setup/loadout/loadout_shoes.dm b/code/modules/client/preference_setup/loadout/loadout_shoes.dm index 58a6f5a72a..6fcfe1fe13 100644 --- a/code/modules/client/preference_setup/loadout/loadout_shoes.dm +++ b/code/modules/client/preference_setup/loadout/loadout_shoes.dm @@ -206,7 +206,7 @@ /datum/gear/shoes/boots/winter/security display_name = "security winter boots" path = /obj/item/clothing/shoes/boots/winter/security - allowed_roles = list("Security Officer", "Head of Security", "Warden", "Detective") + allowed_roles = list(JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_WARDEN, JOB_DETECTIVE) /datum/gear/shoes/boots/winter/science display_name = "science winter boots" @@ -215,7 +215,7 @@ /datum/gear/shoes/boots/winter/command display_name = "site manager's winter boots" path = /obj/item/clothing/shoes/boots/winter/command - allowed_roles = list("Site Manager") + allowed_roles = list(JOB_SITE_MANAGER) /datum/gear/shoes/boots/winter/engineering display_name = "engineering 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 76f5a7baa5..c45e21d815 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -256,7 +256,7 @@ /datum/gear/suit/roles/cloak_hos display_name = "cloak, head of security" path = /obj/item/clothing/accessory/poncho/roles/cloak/hos - allowed_roles = list("Head of Security") + allowed_roles = list(JOB_HEAD_OF_SECURITY) show_roles = FALSE cost = 1 @@ -291,14 +291,14 @@ /datum/gear/suit/roles/cloak_captain display_name = "cloak, site manager" path = /obj/item/clothing/accessory/poncho/roles/cloak/captain - allowed_roles = list("Site Manager") + allowed_roles = list(JOB_SITE_MANAGER) show_roles = FALSE cost = 1 /datum/gear/suit/roles/cloak_hop display_name = "cloak, head of personnel" path = /obj/item/clothing/accessory/poncho/roles/cloak/hop - allowed_roles = list("Head of Personnel") + allowed_roles = list(JOB_HEAD_OF_PERSONNEL) show_roles = FALSE cost = 1 @@ -365,7 +365,7 @@ /datum/gear/suit/forensics display_name = "forensics uniform selection" path = /obj/item/clothing/suit/storage/forensics/red/long - allowed_roles = list("Detective") + allowed_roles = list(JOB_DETECTIVE) /datum/gear/suit/forensics/New() ..() @@ -386,7 +386,7 @@ /datum/gear/suit/cargo_coat display_name = "coat, cargo tech" path = /obj/item/clothing/suit/storage/cargo - allowed_roles = list("Quartermaster","Shaft Miner","Cargo Technician","Head of Personnel") + allowed_roles = list("Quartermaster",JOB_SHAFT_MINER,"Cargo Technician",JOB_HEAD_OF_PERSONNEL) show_roles = FALSE // winter coats go here @@ -397,25 +397,25 @@ /datum/gear/suit/wintercoat/captain display_name = "winter coat, site manager" path = /obj/item/clothing/suit/storage/hooded/wintercoat/captain - allowed_roles = list("Site Manager") + allowed_roles = list(JOB_SITE_MANAGER) show_roles = FALSE /datum/gear/suit/wintercoat/hop display_name = "winter coat, head of personnel" path = /obj/item/clothing/suit/storage/hooded/wintercoat/hop - allowed_roles = list("Head of Personnel") + allowed_roles = list(JOB_HEAD_OF_PERSONNEL) show_roles = FALSE /datum/gear/suit/wintercoat/security display_name = "winter coat, security" path = /obj/item/clothing/suit/storage/hooded/wintercoat/security - allowed_roles = list("Security Officer", "Head of Security", "Warden", "Detective") + allowed_roles = list(JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_WARDEN, JOB_DETECTIVE) show_roles = FALSE /datum/gear/suit/wintercoat/security/hos display_name = "winter coat, head of security" path = /obj/item/clothing/suit/storage/hooded/wintercoat/security/hos - allowed_roles = list("Head of Security") + allowed_roles = list(JOB_HEAD_OF_SECURITY) show_roles = FALSE /datum/gear/suit/wintercoat/medical @@ -511,7 +511,7 @@ /datum/gear/suit/wintercoat/miner display_name = "winter coat, mining" path = /obj/item/clothing/suit/storage/hooded/wintercoat/miner - allowed_roles = list("Shaft Miner") + allowed_roles = list(JOB_SHAFT_MINER) show_roles = FALSE /datum/gear/suit/wintercoat/cargo/qm @@ -656,13 +656,13 @@ /datum/gear/suit/snowsuit/command display_name = "snowsuit, command" path = /obj/item/clothing/suit/storage/snowsuit/command - allowed_roles = list("Site Manager","Research Director","Head of Personnel","Head of Security","Chief Engineer","Command Secretary") + allowed_roles = list(JOB_SITE_MANAGER,"Research Director",JOB_HEAD_OF_PERSONNEL,JOB_HEAD_OF_SECURITY,"Chief Engineer",JOB_COMMAND_SECRETARY) show_roles = FALSE /datum/gear/suit/snowsuit/security display_name = "snowsuit, security" path = /obj/item/clothing/suit/storage/snowsuit/security - allowed_roles = list("Security Officer", "Head of Security", "Warden", "Detective") + allowed_roles = list(JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_WARDEN, JOB_DETECTIVE) show_roles = FALSE /datum/gear/suit/snowsuit/medical @@ -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","Shaft Miner","Cargo Technician","Head of Personnel") + allowed_roles = list("Quartermaster",JOB_SHAFT_MINER,"Cargo Technician",JOB_HEAD_OF_PERSONNEL) show_roles = FALSE /datum/gear/suit/miscellaneous/cardigan @@ -700,7 +700,7 @@ /datum/gear/suit/cmddressjacket display_name = "command dress jacket" path = /obj/item/clothing/suit/storage/toggle/cmddressjacket - allowed_roles = list("Site Manager", "Head of Personnel", "Command Secretary") + allowed_roles = list(JOB_SITE_MANAGER, JOB_HEAD_OF_PERSONNEL, JOB_COMMAND_SECRETARY) show_roles = FALSE /datum/gear/suit/miscellaneous/kimono 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 da6d630f31..241c84412d 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm @@ -57,7 +57,7 @@ /datum/gear/suit/detective_alt display_name = "sleek modern coat selection" path = /obj/item/clothing/suit/storage/det_trench/alt - allowed_roles = list("Head of Security", "Detective") + allowed_roles = list(JOB_HEAD_OF_SECURITY, JOB_DETECTIVE) /datum/gear/suit/detective_alt/New() ..() @@ -231,13 +231,13 @@ Talon winter coat /datum/gear/suit/roles/capboatcloak display_name = "boat cloak, site manager" path = /obj/item/clothing/accessory/poncho/roles/cloak/boat/cap - allowed_roles = list("Site Manager") + allowed_roles = list(JOB_SITE_MANAGER) show_roles = FALSE /datum/gear/suit/roles/hopboatcloak display_name = "boat cloak, head of personnel" path = /obj/item/clothing/accessory/poncho/roles/cloak/boat/hop - allowed_roles = list("Head of Personnel") + allowed_roles = list(JOB_HEAD_OF_PERSONNEL) show_roles = FALSE /datum/gear/suit/roles/boatcloaks @@ -269,13 +269,13 @@ Talon winter coat /datum/gear/suit/roles/capshroud display_name = "shroud, site manager" path = /obj/item/clothing/accessory/poncho/roles/cloak/shroud/cap - allowed_roles = list("Site Manager") + allowed_roles = list(JOB_SITE_MANAGER) show_roles = FALSE /datum/gear/suit/roles/hopshroud display_name = "shroud, head of personnel" path = /obj/item/clothing/accessory/poncho/roles/cloak/shroud/hop - allowed_roles = list("Head of Personnel") + allowed_roles = list(JOB_HEAD_OF_PERSONNEL) show_roles = FALSE /datum/gear/suit/roles/shrouds 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 0047062df5..da24a68ded 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uni_selector.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uni_selector.dm @@ -21,9 +21,9 @@ //Command/Specific /datum/gear/uniform/site_manager_selector - display_name = "Command - Site Manager's Uniforms" - description = "Select from a range of outfits available to all Site Managers, and Talon Captains." - allowed_roles = list("Site Manager","Talon Captain") + display_name = "Command - " + JOB_SITE_MANAGER + "'s Uniforms" + description = "Select from a range of outfits available to all " + JOB_SITE_MANAGER + "s, and Talon Captains." + allowed_roles = list(JOB_SITE_MANAGER,"Talon Captain") show_roles = FALSE path = /obj/item/clothing/under/rank/neo_captain sort_category = "Uniforms" @@ -51,9 +51,9 @@ gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms)) /datum/gear/uniform/head_of_personnel_selector - display_name = "Command - Head of Personnel's Uniforms" + display_name = "Command - " + JOB_HEAD_OF_PERSONNEL + "'s Uniforms" description = "Select from a range of outfits available to all Heads of Personnel." - allowed_roles = list("Head of Personnel") + allowed_roles = list(JOB_HEAD_OF_PERSONNEL) show_roles = FALSE path = /obj/item/clothing/under/rank/neo_hop sort_category = "Uniforms" @@ -190,7 +190,7 @@ /datum/gear/uniform/security_selector display_name = "Security - Basic Uniforms" description = "Select from a range of outfits available to all Security personnel." - allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer","Talon Guard") + allowed_roles = list(JOB_HEAD_OF_SECURITY, JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER,"Talon Guard") show_roles = FALSE path = /obj/item/clothing/under/rank/security/corp sort_category = "Uniforms" @@ -234,9 +234,9 @@ gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms)) /datum/gear/uniform/security_warden_selector - display_name = "Security - Warden's Uniforms" + display_name = "Security - "+ JOB_WARDEN + "'s Uniforms" description = "Select from a range of outfits available to Wardens." - allowed_roles = list("Head of Security","Warden") + allowed_roles = list(JOB_HEAD_OF_SECURITY,JOB_WARDEN) show_roles = FALSE path = /obj/item/clothing/under/rank/warden/corp sort_category = "Uniforms" @@ -256,9 +256,9 @@ gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms)) /datum/gear/uniform/security_detective_selector - display_name = "Security - Detective's Uniforms" + display_name = "Security - " + JOB_DETECTIVE + "'s Uniforms" description = "Select from a range of outfits available to all Detectives." - allowed_roles = list("Head of Security","Detective") + allowed_roles = list(JOB_HEAD_OF_SECURITY,JOB_DETECTIVE) show_roles = FALSE path = /obj/item/clothing/under/det/corporate sort_category = "Uniforms" @@ -275,7 +275,7 @@ /datum/gear/uniform/security_head_selector display_name = "Security - Head's Uniforms" description = "Select from a range of outfits available to all Heads of Security." - allowed_roles = list("Head of Security") + allowed_roles = list(JOB_HEAD_OF_SECURITY) show_roles = FALSE path = /obj/item/clothing/under/rank/head_of_security/corp 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","Shaft Miner","Quartermaster") + allowed_roles = list("Cargo Technician",JOB_SHAFT_MINER,"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("Shaft Miner","Quartermaster","Talon Miner") + allowed_roles = list(JOB_SHAFT_MINER,"Quartermaster","Talon Miner") show_roles = FALSE path = /obj/item/clothing/under/rank/neo_miner sort_category = "Uniforms" diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 5976fe86ea..fc3a0afa55 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -152,9 +152,9 @@ path = /obj/item/clothing/under/scratch/skirt /datum/gear/uniform/suit/detectiveskirt - display_name = "suit, detective skirt (Detective)" + display_name = "suit, detective skirt (" + JOB_DETECTIVE + ")" path = /obj/item/clothing/under/det/skirt - allowed_roles = list("Detective") + allowed_roles = list(JOB_DETECTIVE) /datum/gear/uniform/suit/iaskirt display_name = "suit, Internal Affairs skirt (Internal Affairs)" 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 aac55d5ea0..5f90c82ded 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm @@ -15,7 +15,7 @@ /datum/gear/suit/job_fed/sec display_name = "fed uniform, sec" path = /obj/item/clothing/suit/storage/fluff/fedcoat - allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer") + allowed_roles = list(JOB_HEAD_OF_SECURITY, JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER) /datum/gear/suit/job_fed/medsci display_name = "fed uniform, med/sci" @@ -31,10 +31,10 @@ /datum/gear/suit/job_trek/ds9_coat display_name = "DS9 Overcoat (use uniform)" path = /obj/item/clothing/suit/storage/trek/ds9 - allowed_roles = list("Head of Security","Site Manager","Head of Personnel","Chief Engineer","Research Director", + allowed_roles = list(JOB_HEAD_OF_SECURITY,JOB_SITE_MANAGER,JOB_HEAD_OF_PERSONNEL,"Chief Engineer","Research Director", "Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist", "Scientist","Roboticist","Xenobiologist","Xenobotanist","Atmospheric Technician", - "Engineer","Warden","Detective","Security Officer") + "Engineer",JOB_WARDEN,JOB_DETECTIVE,JOB_SECURITY_OFFICER) /* Swimsuits 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 b81ec92cc1..1387851ea9 100644 --- a/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm @@ -44,7 +44,7 @@ /datum/gear/utility/dufflebag/sec display_name = "security Dufflebag" path = /obj/item/weapon/storage/backpack/dufflebag/sec - allowed_roles = list("Head of Security","Warden","Detective","Security Officer") + allowed_roles = list(JOB_HEAD_OF_SECURITY,JOB_WARDEN,JOB_DETECTIVE,JOB_SECURITY_OFFICER) /datum/gear/utility/dufflebag/eng display_name = "engineering dufflebag" diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno.dm b/code/modules/client/preference_setup/loadout/loadout_xeno.dm index 317aa09d60..998cc7f6e2 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno.dm @@ -169,12 +169,12 @@ /datum/gear/uniform/dept/undercoat/cap display_name = "site manager undercoat (Teshari)" path = /obj/item/clothing/under/teshari/undercoat/jobs/cap - allowed_roles = list("Site Manager") + allowed_roles = list(JOB_SITE_MANAGER) /datum/gear/uniform/dept/undercoat/hop display_name = "head of personnel undercoat (Teshari)" path = /obj/item/clothing/under/teshari/undercoat/jobs/hop - allowed_roles = list("Head of Personnel") + allowed_roles = list(JOB_HEAD_OF_PERSONNEL) /datum/gear/uniform/dept/undercoat/rd display_name = "research director undercoat (Teshari)" @@ -184,7 +184,7 @@ /datum/gear/uniform/dept/undercoat/hos display_name = "head of security undercoat (Teshari)" path = /obj/item/clothing/under/teshari/undercoat/jobs/hos - allowed_roles = list("Head of Security") + allowed_roles = list(JOB_HEAD_OF_SECURITY) /datum/gear/uniform/dept/undercoat/ce display_name = "chief engineer undercoat (Teshari)" @@ -204,22 +204,22 @@ /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","Shaft Miner") + allowed_roles = list("Cargo Technician","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","Shaft Miner") + allowed_roles = list("Quartermaster",JOB_SHAFT_MINER) /datum/gear/uniform/dept/undercoat/security display_name = "security undercoat (Teshari)" path = /obj/item/clothing/under/teshari/undercoat/jobs/sec - allowed_roles = list("Head of Security","Detective","Warden","Security Officer",) + allowed_roles = list(JOB_HEAD_OF_SECURITY,JOB_DETECTIVE,JOB_WARDEN,JOB_SECURITY_OFFICER) /datum/gear/uniform/dept/undercoat/service display_name = "service undercoat (Teshari)" path = /obj/item/clothing/under/teshari/undercoat/jobs/service - allowed_roles = list("Head of Personnel","Bartender","Botanist","Janitor","Chef","Librarian","Chaplain") + allowed_roles = list(JOB_HEAD_OF_PERSONNEL,"Bartender","Botanist","Janitor","Chef","Librarian","Chaplain") /datum/gear/uniform/dept/undercoat/engineer display_name = "engineering undercoat (Teshari)" @@ -278,12 +278,12 @@ /datum/gear/suit/dept/cloak/cap display_name = "site manager cloak (Teshari)" path = /obj/item/clothing/suit/storage/teshari/cloak/jobs - allowed_roles = list("Site Manager") + allowed_roles = list(JOB_SITE_MANAGER) /datum/gear/suit/dept/cloak/hop display_name = "head of personnel cloak (Teshari)" path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/hop - allowed_roles = list("Head of Personnel") + allowed_roles = list(JOB_HEAD_OF_PERSONNEL) /datum/gear/suit/dept/cloak/rd display_name = "research director cloak (Teshari)" @@ -293,7 +293,7 @@ /datum/gear/suit/dept/cloak/hos display_name = "head of security cloak (Teshari)" path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/hos - allowed_roles = list("Head of Security") + allowed_roles = list(JOB_HEAD_OF_SECURITY) /datum/gear/suit/dept/cloak/hos/New() ..() @@ -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","Shaft Miner","Cargo Technician") + allowed_roles = list("Quartermaster",JOB_SHAFT_MINER,"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","Shaft Miner") + allowed_roles = list("Quartermaster",JOB_SHAFT_MINER) /datum/gear/suit/dept/cloak/mining/New() ..() @@ -371,7 +371,7 @@ /datum/gear/suit/dept/cloak/security display_name = "security cloak (Teshari)" path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/sec - allowed_roles = list("Head of Security","Detective","Warden","Security Officer") + allowed_roles = list(JOB_HEAD_OF_SECURITY,JOB_DETECTIVE,JOB_WARDEN,JOB_SECURITY_OFFICER) /datum/gear/suit/dept/cloak/security/New() ..() @@ -384,7 +384,7 @@ /datum/gear/suit/dept/cloak/service display_name = "service cloak (Teshari)" path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/service - allowed_roles = list("Head of Personnel","Bartender","Botanist","Janitor","Chef","Librarian","Chaplain") + allowed_roles = list(JOB_HEAD_OF_PERSONNEL,"Bartender","Botanist","Janitor","Chef","Librarian","Chaplain") /datum/gear/suit/dept/cloak/service/New() ..() @@ -553,7 +553,7 @@ /datum/gear/suit/dept/beltcloak/wrdn display_name = "warden belted cloak (Teshari)" path = /obj/item/clothing/suit/storage/teshari/beltcloak/jobs/wrdn - allowed_roles = list("Head of Security","Warden") + allowed_roles = list(JOB_HEAD_OF_SECURITY,JOB_WARDEN) sort_category = "Xenowear" /datum/gear/suit/dept/beltcloak/jani @@ -565,7 +565,7 @@ /datum/gear/suit/dept/beltcloak/cmd display_name = "command belted cloak (Teshari)" path = /obj/item/clothing/suit/storage/teshari/beltcloak/jobs/command - allowed_roles = list("Site Manager","Head of Personnel","Head of Security","Chief Engineer","Chief Medical Officer","Research Director") + allowed_roles = list(JOB_SITE_MANAGER,JOB_HEAD_OF_PERSONNEL,JOB_HEAD_OF_SECURITY,"Chief Engineer","Chief Medical Officer","Research Director") sort_category = "Xenowear" /datum/gear/suit/cloak_hood 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 7e302bbf4f..3a5f8bbf24 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm @@ -126,7 +126,7 @@ description = "A comfortable official suit for altevian command officers." display_name = "altevian officer's suit selection, site manager" whitelisted = SPECIES_ALTEVIAN - allowed_roles = list("Site Manager") + allowed_roles = list(JOB_SITE_MANAGER) sort_category = "Xenowear" /datum/gear/suit/altevian_officer_suit/New() diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 3178da4757..e676e002c0 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -97,8 +97,8 @@ item_state_slots = list(slot_r_hand_str = "beret_navy", slot_l_hand_str = "beret_navy") /obj/item/clothing/head/beret/sec/navy/hos - name = "Head of Security beret" - desc = "A navy blue beret with a Head of Security's rank emblem. For officers that are more inclined towards style than safety." + name = JOB_HEAD_OF_SECURITY + " beret" + desc = "A navy blue beret with a " + JOB_HEAD_OF_SECURITY + "'s rank emblem. For officers that are more inclined towards style than safety." icon_state = "beret_navy_hos" item_state_slots = list(slot_r_hand_str = "beret_navy", slot_l_hand_str = "beret_navy") @@ -115,8 +115,8 @@ item_state_slots = list(slot_r_hand_str = "beret_black", slot_l_hand_str = "beret_black") /obj/item/clothing/head/beret/sec/corporate/hos - name = "Head of Security beret" - desc = "A corporate black beret with a Head of Security's rank emblem. For officers that are more inclined towards style than safety." + name = JOB_HEAD_OF_SECURITY + " beret" + desc = "A corporate black beret with a " + JOB_HEAD_OF_SECURITY + "'s rank emblem. For officers that are more inclined towards style than safety." icon_state = "beret_corporate_hos" item_state_slots = list(slot_r_hand_str = "beret_black", slot_l_hand_str = "beret_black") @@ -128,21 +128,21 @@ /obj/item/clothing/head/helmet/warden name = "warden's helmet" - desc = "Standard Warden gear. Protects the head from impacts." + desc = "Standard " + JOB_WARDEN + " gear. Protects the head from impacts." /obj/item/clothing/head/helmet/warden/hat name = "warden's hat" - desc = "It's a special hat issued to the Warden of a securiy force." + desc = "It's a special hat issued to the " + JOB_WARDEN + " of a securiy force." icon_state = "policehelm" valid_accessory_slots = null /obj/item/clothing/head/helmet/HoS - name = "Head of Security helmet" - desc = "Standard Head of Security gear. Protects the head from impacts." + name = JOB_HEAD_OF_SECURITY + " helmet" + desc = "Standard " + JOB_HEAD_OF_SECURITY + " gear. Protects the head from impacts." /obj/item/clothing/head/helmet/HoS/hat - name = "Head of Security Hat" - desc = "The hat of the Head of Security. For showing the officers who's in charge." + name = JOB_HEAD_OF_SECURITY + " Hat" + desc = "The hat of the " + JOB_HEAD_OF_SECURITY + ". For showing the officers who's in charge." icon_state = "hoscap" valid_accessory_slots = null @@ -288,4 +288,4 @@ /obj/item/clothing/head/beret/qm name = "quartermaster's beret" desc = "This headwear shows off your Cargonian leadership." - icon_state = "beretqm" \ No newline at end of file + icon_state = "beretqm" diff --git a/code/modules/clothing/head/neohats.dm b/code/modules/clothing/head/neohats.dm index bfc675c5eb..d6ccb26e73 100644 --- a/code/modules/clothing/head/neohats.dm +++ b/code/modules/clothing/head/neohats.dm @@ -2,8 +2,8 @@ this file deals with hats/headwear. */ /obj/item/clothing/head/helmet/HoS/hat/blue - name = "Blue Head of Security Hat" - desc = "The hat of the Head of Security. For showing the officers who's in charge." + name = "Blue " + JOB_HEAD_OF_SECURITY + " Hat" + desc = "The hat of the " + JOB_HEAD_OF_SECURITY + ". For showing the officers who's in charge." icon = 'icons/inventory/head/item.dmi' icon_state = "neo_hoshat_blue" valid_accessory_slots = null diff --git a/code/modules/clothing/masks/hailer.dm b/code/modules/clothing/masks/hailer.dm index 8737aa71a1..5c68ec6e2c 100644 --- a/code/modules/clothing/masks/hailer.dm +++ b/code/modules/clothing/masks/hailer.dm @@ -39,7 +39,7 @@ /obj/item/clothing/mask/gas/sechailer/swat/warden - name = "\improper Warden SWAT mask" + name = "\improper " + JOB_WARDEN + " SWAT mask" desc = "A close-fitting tactical mask with an especially aggressive Compli-o-nator 3000. It has a blue stripe." icon_state = "wardenmask" diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index f3fef22d7b..56be88778e 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -10,7 +10,7 @@ //Captain's space suit This is not the proper path but I don't currently know enough about how this all works to mess with it. /obj/item/clothing/suit/armor/captain - name = "Site Manager's armor" + name = JOB_SITE_MANAGER + "'s armor" desc = "A bulky, heavy-duty piece of exclusive corporate armor. YOU are in charge!" icon_state = "caparmor" w_class = ITEMSIZE_HUGE diff --git a/code/modules/clothing/suits/aliens/teshari.dm b/code/modules/clothing/suits/aliens/teshari.dm index e17ef0e85e..2487e9a745 100644 --- a/code/modules/clothing/suits/aliens/teshari.dm +++ b/code/modules/clothing/suits/aliens/teshari.dm @@ -107,7 +107,7 @@ // Job Cloaks /obj/item/clothing/suit/storage/teshari/cloak/jobs/cap name = "site manager cloak" - desc = "A soft Teshari cloak made for the Site Manager" + desc = "A soft Teshari cloak made for the " + JOB_SITE_MANAGER icon_state = "tesh_cloak_cap" //Cargo @@ -197,7 +197,7 @@ /obj/item/clothing/suit/storage/teshari/cloak/jobs/hos name = "head of security cloak" - desc = "A soft Teshari cloak made for the Head of Security" + desc = "A soft Teshari cloak made for the " + JOB_HEAD_OF_SECURITY icon_state = "tesh_cloak_hos" /obj/item/clothing/suit/storage/teshari/cloak/jobs/sec @@ -214,7 +214,7 @@ /obj/item/clothing/suit/storage/teshari/cloak/jobs/hop name = "head of personnel cloak" - desc = "A soft Teshari cloak made for the Head of Personnel" + desc = "A soft Teshari cloak made for the " + JOB_HEAD_OF_PERSONNEL icon_state = "tesh_cloak_hop" /obj/item/clothing/suit/storage/teshari/cloak/jobs/service @@ -694,16 +694,15 @@ /obj/item/clothing/suit/storage/teshari/beltcloak/jobs/wrdn name = "warden belted cloak" - desc = "A soft Teshari cloak made for the Warden" + desc = "A soft Teshari cloak made for the " + JOB_WARDEN icon_state = "tesh_beltcloak_wrdn" /obj/item/clothing/suit/storage/teshari/beltcloak/jobs/hos name = "security chief belted cloak" - desc = "A soft Teshari cloak made for the Head of Security" + desc = "A soft Teshari cloak made for the " + JOB_HEAD_OF_SECURITY icon_state = "tesh_beltcloak_hos" /obj/item/clothing/suit/storage/teshari/beltcloak/jobs/jani name = "janitor belted cloak" desc = "A soft Teshari cloak made for the Janitor" icon_state = "tesh_beltcloak_jani" - diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 12ed13f601..c90e714bf9 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -309,7 +309,7 @@ icon_nobadge = "wardenvest_nobadge" /obj/item/clothing/suit/storage/vest/wardencoat - name = "Warden's jacket" + name = JOB_WARDEN + "'s jacket" desc = "An armoured jacket with silver rank pips and livery." icon_state = "warden_jacket" blood_overlay_type = "suit" @@ -317,7 +317,7 @@ flags_inv = HIDETIE|HIDEHOLSTER /obj/item/clothing/suit/storage/vest/wardencoat/alt - name = "Warden's jacket" + name = JOB_WARDEN + "'s jacket" desc = "An armoured jacket with silver rank pips and livery." icon_state = "warden_alt" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 37ac8cd948..ce1ec1f66d 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -28,14 +28,14 @@ //Captain /obj/item/clothing/suit/captunic name = "site manager's parade tunic" - desc = "Worn by a Site Manager to show their class." + desc = "Worn by a " + JOB_SITE_MANAGER + " to show their class." icon_state = "captunic" body_parts_covered = UPPER_TORSO|ARMS flags_inv = HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER /obj/item/clothing/suit/captunic/capjacket name = "site manager's uniform jacket" - desc = "A less formal jacket for everyday Site Manager use." + desc = "A less formal jacket for everyday " + JOB_SITE_MANAGER + " use." icon_state = "capjacket" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS flags_inv = HIDEHOLSTER diff --git a/code/modules/clothing/under/accessories/accessory_vr.dm b/code/modules/clothing/under/accessories/accessory_vr.dm index 899359966f..d5837ebce4 100644 --- a/code/modules/clothing/under/accessories/accessory_vr.dm +++ b/code/modules/clothing/under/accessories/accessory_vr.dm @@ -961,13 +961,13 @@ /obj/item/clothing/accessory/poncho/roles/cloak/mantle/hop name = "head of personnel mantle" - desc = "A shoulder mantle bearing the colors of the Head of Personnel's uniform, featuring the typical royal blue contrasted by authoritative red." + desc = "A shoulder mantle bearing the colors of the " + JOB_HEAD_OF_PERSONNEL + "'s uniform, featuring the typical royal blue contrasted by authoritative red." icon_state = "hopmantle" item_state = "hopmantle" /obj/item/clothing/accessory/poncho/roles/cloak/mantle/cap name = "site manager mantle" - desc = "A shoulder mantle bearing the colors usually found on a Site Manager, a commanding blue with regal gold inlay." + desc = "A shoulder mantle bearing the colors usually found on a " + JOB_SITE_MANAGER + ", a commanding blue with regal gold inlay." icon_state = "capmantle" item_state = "capmantle" diff --git a/code/modules/clothing/under/accessories/badges.dm b/code/modules/clothing/under/accessories/badges.dm index cfc5a68e71..8f4ba015b6 100644 --- a/code/modules/clothing/under/accessories/badges.dm +++ b/code/modules/clothing/under/accessories/badges.dm @@ -135,25 +135,25 @@ /obj/item/clothing/accessory/badge/holo/officer name = "officer's badge" - desc = "A bronze corporate security badge. Stamped with the words 'Security Officer.'" + desc = "A bronze corporate security badge. Stamped with the words '" + JOB_SECURITY_OFFICER + ".'" icon_state = "bronzebadge" slot_flags = SLOT_TIE | SLOT_BELT /obj/item/clothing/accessory/badge/holo/warden name = "warden's holobadge" - desc = "A silver corporate security badge. Stamped with the words 'Warden.'" + desc = "A silver corporate security badge. Stamped with the words '" + JOB_WARDEN + ".'" icon_state = "silverbadge" slot_flags = SLOT_TIE | SLOT_BELT /obj/item/clothing/accessory/badge/holo/hos name = "head of security's holobadge" - desc = "An immaculately polished gold security badge. Stamped with the words 'Head of Security.'" + desc = "An immaculately polished gold security badge. Stamped with the words '" + JOB_HEAD_OF_SECURITY + ".'" icon_state = "goldbadge" slot_flags = SLOT_TIE | SLOT_BELT /obj/item/clothing/accessory/badge/holo/detective name = "detective's holobadge" - desc = "An immaculately polished gold security badge on leather. Labeled 'Detective.'" + desc = "An immaculately polished gold security badge on leather. Labeled '" + JOB_DETECTIVE + ".'" icon_state = "marshalbadge" slot_flags = SLOT_TIE | SLOT_BELT diff --git a/code/modules/clothing/under/eva_bodysuits.dm b/code/modules/clothing/under/eva_bodysuits.dm index 8b77595f9f..73856571df 100644 --- a/code/modules/clothing/under/eva_bodysuits.dm +++ b/code/modules/clothing/under/eva_bodysuits.dm @@ -31,7 +31,7 @@ /obj/item/clothing/under/undersuit/sec/hos name = "security command undersuit" - desc = "A reinforced undersuit, intended for wearing under a voidsuit or other EVA equipment. This one is specifically made for the Head of Security or equivalent, and has slight protective capabilities against simple melee attacks." + desc = "A reinforced undersuit, intended for wearing under a voidsuit or other EVA equipment. This one is specifically made for the " + JOB_HEAD_OF_SECURITY + " or equivalent, and has slight protective capabilities against simple melee attacks." icon_state = "bodysuit_seccom" item_state = "bodysuit_seccom" diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index 9f714d9a0c..4788b765ea 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -13,7 +13,7 @@ item_state_slots = list(slot_r_hand_str = "ba_suit", slot_l_hand_str = "ba_suit") /obj/item/clothing/under/rank/captain //Alright, technically not a 'civilian' but its better then giving a .dm file for a single define. - desc = "It's a blue jumpsuit with some gold markings denoting the rank of \"Site Manager\"." + desc = "It's a blue jumpsuit with some gold markings denoting the rank of \"" + JOB_SITE_MANAGER + "\"." name = "site manager's jumpsuit" icon_state = "captain" rolled_sleeves = 0 @@ -80,7 +80,7 @@ rolled_sleeves = -1 /obj/item/clothing/under/rank/head_of_personnel - desc = "It's a jumpsuit worn by someone who works in the position of \"Head of Personnel\"." + desc = "It's a jumpsuit worn by someone who works in the position of \"" + JOB_HEAD_OF_PERSONNEL + "\"." name = "head of personnel's jumpsuit" icon_state = "hop" rolled_sleeves = 0 diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index 3d6bdfec0c..0d5c64dfad 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -9,7 +9,7 @@ * Security */ /obj/item/clothing/under/rank/warden - desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for more robust protection. It has the word \"Warden\" written on the shoulders." + desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for more robust protection. It has the word \"" + JOB_WARDEN+ "\" written on the shoulders." name = "warden's jumpsuit" icon_state = "warden" item_state_slots = list(slot_r_hand_str = "red", slot_l_hand_str = "red") @@ -147,7 +147,7 @@ * Head of Security */ /obj/item/clothing/under/rank/head_of_security - desc = "It's a jumpsuit worn by those few with the dedication to achieve the position of \"Head of Security\". It has additional armor to protect the wearer." + desc = "It's a jumpsuit worn by those few with the dedication to achieve the position of \"" + JOB_HEAD_OF_SECURITY + "\". It has additional armor to protect the wearer." name = "head of security's jumpsuit" icon_state = "hos" item_state_slots = list(slot_r_hand_str = "red", slot_l_hand_str = "red") @@ -178,14 +178,14 @@ rolled_sleeves = 0 /obj/item/clothing/under/rank/head_of_security/navyblue - desc = "The insignia on this uniform tells you that this uniform belongs to the Head of Security." + desc = "The insignia on this uniform tells you that this uniform belongs to the " + JOB_HEAD_OF_SECURITY + "." name = "head of security's uniform" icon_state = "hosblueclothes" item_state_slots = list(slot_r_hand_str = "ba_suit", slot_l_hand_str = "ba_suit") rolled_sleeves = 0 /obj/item/clothing/under/rank/warden/navyblue - desc = "The insignia on this uniform tells you that this uniform belongs to the Warden." + desc = "The insignia on this uniform tells you that this uniform belongs to the " + JOB_WARDEN + "." name = "warden's uniform" icon_state = "wardenblueclothes" item_state_slots = list(slot_r_hand_str = "ba_suit", slot_l_hand_str = "ba_suit") @@ -202,16 +202,15 @@ rolled_sleeves = 0 /obj/item/clothing/under/rank/head_of_security/tan - desc = "The insignia on this uniform tells you that this uniform belongs to the Head of Security." + desc = "The insignia on this uniform tells you that this uniform belongs to the " + JOB_HEAD_OF_SECURITY+ "." name = "head of security's uniform" icon_state = "hostanclothes" item_state_slots = list(slot_r_hand_str = "ba_suit", slot_l_hand_str = "ba_suit") rolled_sleeves = 0 /obj/item/clothing/under/rank/warden/tan - desc = "The insignia on this uniform tells you that this uniform belongs to the Warden." + desc = "The insignia on this uniform tells you that this uniform belongs to the " + JOB_WARDEN + "." name = "warden's uniform" icon_state = "wardentanclothes" item_state_slots = list(slot_r_hand_str = "ba_suit", slot_l_hand_str = "ba_suit") rolled_sleeves = 0 - diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 36a314601d..c00de40e7f 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -418,7 +418,7 @@ /obj/item/clothing/under/dress/dress_cap name = "site manager's dress uniform" - desc = "Feminine fashion for the style conscious Site Manager." + desc = "Feminine fashion for the style conscious " + JOB_SITE_MANAGER + "." icon_state = "dress_cap" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS @@ -751,7 +751,7 @@ /obj/item/clothing/under/captainformal name = "site manager's formal uniform" - desc = "A Site Manager's formal-wear, for special occasions." + desc = "A " + JOB_SITE_MANAGER + "'s formal-wear, for special occasions." icon_state = "captain_formal" item_state_slots = list(slot_r_hand_str = "lawyer_blue", slot_l_hand_str = "lawyer_blue") diff --git a/code/modules/clothing/under/shorts.dm b/code/modules/clothing/under/shorts.dm index b2289e70eb..72b0e9dc3e 100644 --- a/code/modules/clothing/under/shorts.dm +++ b/code/modules/clothing/under/shorts.dm @@ -237,11 +237,11 @@ siemens_coefficient = 0.9 /obj/item/clothing/under/rank/warden/skirt - desc = "Standard feminine fashion for a Warden. It is made of sturdier material than standard jumpskirts. It has the word \"Warden\" written on the shoulders." + desc = "Standard feminine fashion for a " + JOB_WARDEN + ". It is made of sturdier material than standard jumpskirts. It has the word \"" + JOB_WARDEN + "\" written on the shoulders." name = "warden's jumpskirt" icon_state = "wardenf" /obj/item/clothing/under/rank/head_of_security/skirt - desc = "It's a fashionable jumpskirt worn by those few with the dedication to achieve the position of \"Head of Security\". It has additional armor to protect the wearer." + desc = "It's a fashionable jumpskirt worn by those few with the dedication to achieve the position of \"" + JOB_HEAD_OF_SECURITY + "\". It has additional armor to protect the wearer." name = "head of security's jumpskirt" icon_state = "hosf" diff --git a/code/modules/clothing/under/xenos/teshari.dm b/code/modules/clothing/under/xenos/teshari.dm index d7254524f7..e116ec32fa 100644 --- a/code/modules/clothing/under/xenos/teshari.dm +++ b/code/modules/clothing/under/xenos/teshari.dm @@ -222,12 +222,12 @@ //Job Undercoats /obj/item/clothing/under/teshari/undercoat/jobs/cap name = "site manager undercoat" - desc = "A traditional Teshari garb made for the Site Manager" + desc = "A traditional Teshari garb made for the " + JOB_SITE_MANAGER icon_state = "tesh_uniform_cap" /obj/item/clothing/under/teshari/undercoat/jobs/hop name = "head of personnel undercoat" - desc = "A traditional Teshari garb made for the Head of Personnel" + desc = "A traditional Teshari garb made for the " + JOB_HEAD_OF_PERSONNEL icon_state = "tesh_uniform_hop" /obj/item/clothing/under/teshari/undercoat/jobs/ce @@ -237,7 +237,7 @@ /obj/item/clothing/under/teshari/undercoat/jobs/hos name = "head of security undercoat" - desc = "A traditional Teshari garb made for the Head of Security" + desc = "A traditional Teshari garb made for the " + JOB_HEAD_OF_SECURITY icon_state = "tesh_uniform_hos" /obj/item/clothing/under/teshari/undercoat/jobs/rd diff --git a/code/modules/events/money_hacker.dm b/code/modules/events/money_hacker.dm index 025bcc6901..09510bec60 100644 --- a/code/modules/events/money_hacker.dm +++ b/code/modules/events/money_hacker.dm @@ -24,7 +24,7 @@ GLOBAL_VAR_INIT(account_hack_attempted, 0) for(var/obj/machinery/message_server/MS in machines) if(!MS.active) continue - MS.send_rc_message("Head of Personnel's Desk", my_department, message, "", "", 2) + MS.send_rc_message(JOB_HEAD_OF_PERSONNEL + "'s Desk", my_department, message, "", "", 2) /datum/event/money_hacker/tick() @@ -66,4 +66,4 @@ GLOBAL_VAR_INIT(account_hack_attempted, 0) for(var/obj/machinery/message_server/MS in machines) if(!MS.active) continue - MS.send_rc_message("Head of Personnel's Desk", my_department, message, "", "", 2) + MS.send_rc_message(JOB_HEAD_OF_PERSONNEL + "'s Desk", my_department, message, "", "", 2) diff --git a/code/modules/flufftext/Dreaming.dm b/code/modules/flufftext/Dreaming.dm index 53ffe22879..93c74acca2 100644 --- a/code/modules/flufftext/Dreaming.dm +++ b/code/modules/flufftext/Dreaming.dm @@ -1,14 +1,14 @@ var/list/dreams = list( - "an ID card","a bottle","a familiar face","a crewmember","a toolbox","a Security Officer","the Site Manager", + "an ID card","a bottle","a familiar face","a crewmember","a toolbox","a " + JOB_SECURITY_OFFICER,"the " + JOB_SITE_MANAGER, "voices from all around","deep space","a doctor","the engine","a traitor","an ally","darkness", "light","a scientist","a monkey","a catastrophe","a loved one","a gun","warmth","freezing","the sun", "a hat","the Luna","a ruined station","a planet","phoron","air","the medical bay","the bridge","blinking lights", "a blue light","an abandoned laboratory","NanoTrasen","mercenaries","blood","healing","power","respect", "riches","space","a crash","happiness","pride","a fall","water","flames","ice","melons","flying","the eggs","money", - "the Head of Personnel","the Head of Security","the Chief Engineer","the Research Director","the Chief Medical Officer", - "the Detective","the Warden","an Internal Affairs Agent","an Engineer","the Janitor","the Atmospheric Technician", - "the Quartermaster","a Cargo Technician","the Botanist","a Shaft Miner","the Psychologist","the Chemist","a Geneticist", + "the " + JOB_HEAD_OF_PERSONNEL,"the " + JOB_HEAD_OF_SECURITY,"the Chief Engineer","the Research Director","the Chief Medical Officer", + "the " + JOB_DETECTIVE,"the " + JOB_WARDEN,"an Internal Affairs Agent","an Engineer","the Janitor","the Atmospheric Technician", + "the Quartermaster","a Cargo Technician","the Botanist","a " + JOB_SHAFT_MINER,"the Psychologist","the Chemist","a Geneticist", "the Virologist","the 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", diff --git a/code/modules/food/food/drinks.dm b/code/modules/food/food/drinks.dm index 9c2944df26..4df37bcc38 100644 --- a/code/modules/food/food/drinks.dm +++ b/code/modules/food/food/drinks.dm @@ -483,8 +483,8 @@ ..() /obj/item/weapon/reagent_containers/food/drinks/flask - name = "\improper Site Manager's flask" - desc = "A metal flask belonging to the Site Manager" + name = "\improper " + JOB_SITE_MANAGER + "'s flask" + desc = "A metal flask belonging to the " + JOB_SITE_MANAGER icon_state = "flask" volume = 60 center_of_mass = list("x"=17, "y"=7) @@ -503,7 +503,7 @@ icon_state = "lithiumflask" /obj/item/weapon/reagent_containers/food/drinks/flask/detflask - name = "\improper Detective's flask" + name = "\improper " + JOB_DETECTIVE + "'s flask" desc = "A metal flask with a leather band and golden badge belonging to the detective." icon_state = "detflask" volume = 60 @@ -522,4 +522,3 @@ icon_state = "vacuumflask" volume = 60 center_of_mass = list("x"=15, "y"=4) - diff --git a/code/modules/gamemaster/event2/events/command/money_hacker.dm b/code/modules/gamemaster/event2/events/command/money_hacker.dm index 287844cf2d..6b9e734018 100644 --- a/code/modules/gamemaster/event2/events/command/money_hacker.dm +++ b/code/modules/gamemaster/event2/events/command/money_hacker.dm @@ -37,7 +37,7 @@ for(var/obj/machinery/message_server/MS in machines) if(!MS.active) continue - MS.send_rc_message("Head of Personnel's Desk", my_department, "[message]
", "", "", 2) + MS.send_rc_message(JOB_HEAD_OF_PERSONNEL + "'s Desk", my_department, "[message]
", "", "", 2) // Nobody reads the requests consoles so lets use the radio as well. global_announcer.autosay(message, my_department, DEPARTMENT_COMMAND) @@ -57,7 +57,7 @@ for(var/obj/machinery/message_server/MS in machines) if(!MS.active) continue - MS.send_rc_message("Head of Personnel's Desk", my_department, message, "", "", 2) + MS.send_rc_message(JOB_HEAD_OF_PERSONNEL + "'s Desk", my_department, message, "", "", 2) global_announcer.autosay(message, my_department, DEPARTMENT_COMMAND) diff --git a/code/modules/games/cah_black_cards.dm b/code/modules/games/cah_black_cards.dm index c2c32b9948..877557d0dc 100644 --- a/code/modules/games/cah_black_cards.dm +++ b/code/modules/games/cah_black_cards.dm @@ -7,7 +7,7 @@ "The Chaplain this shift is worshiping _____.", "Cargo ordered a crate full of _____.", "An ERT was called due to ______.", - "Alert! The Site Manager has armed themselves with _____.", + "Alert! The " + JOB_SITE_MANAGER + " has armed themselves with _____.", "Current Laws: ________ is your master.", "Current Laws: ________ is the enemy.", "_____ vented the entirety of Cargo.", @@ -16,7 +16,7 @@ "Caution, ______ have been detected in collision course with the station.", "Today's kitchen menu includes _______.", "What did the mercenaries want when they attacked the station?", - "I think the Site Manager is insane. He just demanded ______ in his office.", + "I think the " + JOB_SITE_MANAGER + " is insane. He just demanded ______ in his office.", "Fuckin' scientists, they just turned Misc. Research into _______ .", "What's my fetish?", "Hello, _______ here with _______", @@ -182,27 +182,27 @@ "Why do I hurt all over?", "In the seventh circle of Hell, sinners must endure _____ for all eternity.", "A successful job interview begins with a firm handshake and ends with _____.", - "Lovin’ you is easy ’cause you’re _____.", + "Lovin� you is easy �cause you�re _____.", "My life is ruled by a vicious cycle of _____ and _____.", "The blind date was going horribly until we discovered our shared interest in _____.", "_____. Awesome in theory, kind of a mess in practice.", - "I’m not like the rest of you. I’m too rich and busy for _____.", + "I�m not like the rest of you. I�m too rich and busy for _____.", "(Pick 2) _____: Hours of fun. Easy to use. Perfect for _____!", "What left this stain on my couch?", "Call the law offices of Goldstein & Goldstein, because no one should have to tolerate _____ in the workplace.", "(Pick 2) When you get right down to it, _____ is just _____.", "Turns out that _____ Man was neither the hero we needed nor wanted.", "As part of his daily regimen, Anderson Cooper sets aside 15 minutes for _____.", - "Money can’t buy me love, but it can buy me _____.", + "Money can�t buy me love, but it can buy me _____.", "(Pick 2) With enough time and pressure, _____ will turn into _____.", "And what did you bring for show and tell?", "During high school I never really fit in until I found _____ club.", - "Hey baby, come back to my place and I’ll show you _____.", - "(Pick 2) After months of practice with _____, I think I’m finally ready for _____.", + "Hey baby, come back to my place and I�ll show you _____.", + "(Pick 2) After months of practice with _____, I think I�m finally ready for _____.", "To prepare for his upcoming role, Daniel Day-Lewis immersed himself in the world of _____.", "Finally! A service that delivers _____ right to your door.", "My gym teacher got fired for adding _____ to the obstacle course.", "(Pick 2) Having problems with _____? Try _____!", - "As part of his contract, Prince won’t perform without _____ in his dressing room.", - "(Pick 2) Listen, son. If you want to get involved with _____, I won’t stop you. Just steer clear of _____." + "As part of his contract, Prince won�t perform without _____ in his dressing room.", + "(Pick 2) Listen, son. If you want to get involved with _____, I won�t stop you. Just steer clear of _____." ) diff --git a/code/modules/lore_codex/legal_code_data/corporate_regulations.dm b/code/modules/lore_codex/legal_code_data/corporate_regulations.dm index ca0cb919f9..e93ecd1629 100644 --- a/code/modules/lore_codex/legal_code_data/corporate_regulations.dm +++ b/code/modules/lore_codex/legal_code_data/corporate_regulations.dm @@ -4,7 +4,7 @@ or otherwise on-board a NanoTrasen installation, which if you are reading this, you likely are at one. Corporate Regulations, \ commonly shortened to Corp Regs by employees, is common throughout NanoTrasen's other holdings. Offenses against Corp Regs can \ range from things like littering, to disrespecting a Head of Staff, to failing to follow a valid order from a superior. \ - All NanoTrasen employees must follow these regulations, no one is above them, not even the Station Director. \ + All NanoTrasen employees must follow these regulations, no one is above them, not even the " + JOB_SITE_MANAGER + ". \ The only exception for this is Asset Protection." children = list( /datum/lore/codex/page/corporate_punishments, @@ -79,14 +79,14 @@ Brig time may also be used for repeat offenders.
\
  • Write-ups to Central Command may be recommended or mandated for specific offenses. Internal Affairs is to ensure that this is \ adhered to, and assist if needed.

    • \ -
  • Reassignments as a form of punishment may be done by the Station Director, with consent from both the offender and the offender's \ +
  • Reassignments as a form of punishment may be done by the " + JOB_SITE_MANAGER + ", with consent from both the offender and the offender's \ Superior, if one exists. Generally the new role for the offender is usually considered something menial or related to their offense, for example: \ Janitor, Miner, Cook, Gardener. This punishment can be especially fitting for certain violations such as someone who made graffiti being reassigned to janitorial duties.

    • \ -
  • Demotions may be done by the offender's Superior, at their discretion. The Station Director may also do this, \ +
  • Demotions may be done by the offender's Superior, at their discretion. The " + JOB_SITE_MANAGER + " may also do this, \ however the Director is recommended to defer to the offender's direct Superior if one exists.

    • \ -
  • Terminations of employment from NanoTrasen can only be issued by the Station Director. This is the most severe corporate punishment available. \ +
  • Terminations of employment from NanoTrasen can only be issued by the " + JOB_SITE_MANAGER + ". This is the most severe corporate punishment available. \ It should be noted that visitors and other non-employees cannot be terminated, obviously. Central Command must be informed of the termination, if one is applied.
    • \ -
  • Hold until Transfer is an option reserved for the Station Director only for repeat offenders, for serious violations of Regulations, or it the offender poses a \ +
  • Hold until Transfer is an option reserved for the " + JOB_SITE_MANAGER + " only for repeat offenders, for serious violations of Regulations, or it the offender poses a \ credible threat to the station or crew.
    • \ " @@ -251,7 +251,7 @@ /datum/lore/codex/page/law/i_am_the_law/add_content() name = "Exceeding Official Powers" definition = "Acting beyond what is allowed by Corporate Regulations or Standard Operating Procedure, generally as a member of Command or Security." - suggested_punishments = "Demotion or termination at discretion of Station Admin. Send notice to Central Command if a Head of Staff or Station Director had exceeded their powers." + suggested_punishments = "Demotion or termination at discretion of Station Admin. Send notice to Central Command if a Head of Staff or " + JOB_SITE_MANAGER + " had exceeded their powers." notes = "The difference between this and [quick_link("Abuse of Office")] is that generally this charge is for instances of someone using their position to go beyond their \ assigned role, or generally acting 'above the regulations'." mandated = TRUE @@ -260,7 +260,7 @@ /datum/lore/codex/page/law/abuse_of_office/add_content() name = "Abuse of Office" definition = "Doing illegal, immoral, or otherwise disallowed actions, in an official capacity, placing their own interests ahead of the interests of the Company." - suggested_punishments = "Demotion. Termination at discretion of Station Admin. Send notice to Central Command if a Head of Staff or Station Director had abused their office." + suggested_punishments = "Demotion. Termination at discretion of Station Admin. Send notice to Central Command if a Head of Staff or " + JOB_SITE_MANAGER + " had abused their office." notes = "The difference between this and [quick_link("Exceeding Official Powers")] is that this charge is for instances of someone using their authority to adversely \ affect another crewmember or visitor unlawfully by using their authority, or otherwise empowering themselves for their own personal gain." mandated = TRUE @@ -273,34 +273,34 @@ notes = "Visitors boarding the station with restricted items must leave the item outside the station (e.g. vessel), or surrender it to the Security team. \ A list of restricted items are provided inside this book.\

    \ - Roles authorized to handle a weapon by default include; Station Director, Head of Personnel, Head of Security, Security Officers, Detectives, and anyone possessing \ + Roles authorized to handle a weapon by default include; " + JOB_SITE_MANAGER + ", " + JOB_HEAD_OF_PERSONNEL + ", " + JOB_HEAD_OF_SECURITY + ", Security Officers, Detectives, and anyone possessing \ a valid weapon permit." /datum/lore/codex/page/law/breaking_sop_major name = "Breaking Standard Operation Procedure (Major)" definition = "Actively and willfully disregarding the station's Standard Operating Procedures, where the probable effects includes death or destruction." - suggested_punishments = "30 minutes to 1 hour of Brig time. Demotion left to discretion of Superior, but strongly suggested. Termination at discretion of Station Director." + suggested_punishments = "30 minutes to 1 hour of Brig time. Demotion left to discretion of Superior, but strongly suggested. Termination at discretion of " + JOB_SITE_MANAGER + "." suggested_brig_time = 1 HOUR notes = "This includes non-compliance to orders from Emergency Responders, entering breached areas without proper EVA gear." /datum/lore/codex/page/law/neglect_of_duty name = "Neglect of Duty" definition = "To fail to meet satisfactory work standards." - suggested_punishments = "Demotion at discretion of Superior. Termination at discretion of Station Director." + suggested_punishments = "Demotion at discretion of Superior. Termination at discretion of " + JOB_SITE_MANAGER + "." notes = "This includes accidents, refusing or failing to work, or simply not providing a reasonable amount of productivity, when the offender is capable of work. This charge \ is meant to be applied only by Command staff to their subordinates, and not from individual Security Officers." /datum/lore/codex/page/law/deception name = "Deception" definition = "To lie in an official report." - suggested_punishments = "Demotion. Termination at discretion of Station Director. Notify Central Command." + suggested_punishments = "Demotion. Termination at discretion of " + JOB_SITE_MANAGER + ". Notify Central Command." notes = "This includes lying or withholding information to your superior in a report or lying to the crew about a situation." mandated = TRUE /datum/lore/codex/page/law/wrongful_dismissal name = "Wrongful Dismissal" definition = "To demote, dismiss, terminate, or otherwise reduce a crewmember's rank for no valid, or a knowingly false reason." - suggested_punishments = "Demotion. Termination at discretion of Station Director. Notify Central Command." + suggested_punishments = "Demotion. Termination at discretion of " + JOB_SITE_MANAGER + ". Notify Central Command." notes = "An Internal Affairs Agent is required to do an investigation in order to conclude if this has occurred or not. Security cannot \ give this charge out on their own." mandated = TRUE @@ -308,6 +308,6 @@ /datum/lore/codex/page/law/abuse_of_confiscated_equipment name = "Abuse of Confiscated Equipment" definition = "To take and use equipment confiscated as evidence or contraband, generally as a member of Security or Command." - suggested_punishments = "Demotion of the user. Termination at discretion of Station Director. Return confiscated equipment to evidence storage." + suggested_punishments = "Demotion of the user. Termination at discretion of " + JOB_SITE_MANAGER +". Return confiscated equipment to evidence storage." notes = "Security shouldn't be using evidence for anything but evidence, and should never use contraband. This is meant for people misusing evidence for personal use. Evidence stolen \ in order to cover up a crime would fall under Theft or Tampering with Evidence." diff --git a/code/modules/lore_codex/legal_code_data/main.dm b/code/modules/lore_codex/legal_code_data/main.dm index a16d7d35d6..8e5ffee829 100644 --- a/code/modules/lore_codex/legal_code_data/main.dm +++ b/code/modules/lore_codex/legal_code_data/main.dm @@ -9,7 +9,7 @@

    \ In this book, there are two different types of rules. Corporate Regulations, and Laws. They each cover specific situations, and are both enforced \ by the Security team. Despite this, however, the punishments vary considerably for the two types. It should also be noted that no one is above \ - these rules, not even the Station Director.\ + these rules, not even the " + JOB_SITE_MANAGER + ".\

    \ Also contained inside are our Standard Operating Procedures, that all employees of NanoTrasen are expected to follow, and for the local facility's \ Command team and Internal Affairs to enforce.\ @@ -98,4 +98,4 @@ HTML += "" data = data + HTML - ..() \ No newline at end of file + ..() 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 58e62cda2a..24fa475f3f 100644 --- a/code/modules/lore_codex/legal_code_data/sif_law.dm +++ b/code/modules/lore_codex/legal_code_data/sif_law.dm @@ -157,7 +157,7 @@ name = "Excessive Force" definition = "Using more force than what is required to safely detain someone, using force against a helpless or incapacitated person, \ or using force against an unarmed and compliant person." - suggested_punishments = "Demotion. Termination at discretion of Superior, or Station Director. Send notice to Central Command if a Head of Security had used excessive force." + suggested_punishments = "Demotion. Termination at discretion of Superior, or " + JOB_SITE_MANAGER + ". Send notice to Central Command if a " + JOB_HEAD_OF_SECURITY + " had used excessive force." notes = "This charge also is applicible to non-Security personnel acting in self defense. \ Persons whom have caused a person to die as a result of excessive force should have [quick_link("Manslaughter")] applied instead, if the circumstances were \ unjustified." diff --git a/code/modules/lore_codex/legal_code_data/sop.dm b/code/modules/lore_codex/legal_code_data/sop.dm index 15dd5fdeaf..9f1375733e 100644 --- a/code/modules/lore_codex/legal_code_data/sop.dm +++ b/code/modules/lore_codex/legal_code_data/sop.dm @@ -19,7 +19,7 @@

    \

    Visitors

    \ Visitors of all forms are required to follow SOP, Corporate Regulations, and local laws while onboard or around NanoTrasen property. Visitors who are \ - not registered on the manifest are required to speak with the Head of Personnel or Station Director, if one exists, to register, and obtain an identification \ + not registered on the manifest are required to speak with the " + JOB_HEAD_OF_PERSONNEL + " or " + JOB_SITE_MANAGER + ", if one exists, to register, and obtain an identification \ card denoting their status as a visitor. Visitors registered on the manifest are free to visit any public (non-access restricted) location on the facility, however \ they are still subject to the same regulations and rules as an ordinary crew member.\
    \ @@ -60,7 +60,7 @@ /* /datum/lore/codex/page/command_sop name = "Command SOP" - data = "This SOP is specific to those in the Command department, which includes the Station Director, Head of Personnel, Chief Engineer, Head of Security, and Research Director. \ + data = "This SOP is specific to those in the Command department, which includes the " + JOB_SITE_MANAGER + ", Head of Personnel, Chief Engineer, " + JOB_HEAD_OF_SECURITY + ", and Research Director. \ This also covers Internal Affairs Agents, however they do not occupy a position inside Command crew, and instead exist outside of all the other departments.\
    \

    Bridge Secretaries

    \ @@ -68,10 +68,10 @@ regards.\
    \

    Responsibility and Authority

    \ - The Chain of Command is generally represented as: Station Director > Command Crew > Station Crew.
    \ - The Station Director is responsible for, and authoritative in, and and all matters regarding the station. In the absence of a Department Head, the Station Director \ + The Chain of Command is generally represented as: " + JOB_SITE_MANAGER + " > Command Crew > Station Crew.
    \ + The " + JOB_SITE_MANAGER + " is responsible for, and authoritative in, and and all matters regarding the station. In the absence of a Department Head, the " + JOB_SITE_MANAGER + " \ may choose to appoint an Acting Head, or else act as the voice of authority in a department. If a Department Head arrives on station, the Acting Head \ - is to step down, and the Station Director is to defer to the Department Head in matters involving said department.\ + is to step down, and the " + JOB_SITE_MANAGER + " is to defer to the Department Head in matters involving said department.\
    \ The remainder of the Command Crew is of equal rank among themselves, and are responsible for, and authoritative over only their own department, crew, and location. \ In the case of the Head of Personnel, this includes Service, Cargo, and any other Civilian role. Command Crew only have authority in their own department, when going \ @@ -80,7 +80,7 @@

    Demotion

    \ A member of the Command Crew may call for the demotion of any member of their department for disregarding safety protocol, disobeying orders with serious consequences, \ or other gross incompetence. Certain infractions necessitate that a guilty crew member receive a demotion. Demotion is to be performed by the Head of Personnel, or the \ - Station Director, as soon as possible. The demoted crewmember is to be present during the demotion, unless it is caused by a criminal sentence. If said crewmemeber \ + " + JOB_SITE_MANAGER + ", as soon as possible. The demoted crewmember is to be present during the demotion, unless it is caused by a criminal sentence. If said crewmemeber \ refuses to comply with a demotion order, Security is to escort them to the Head of Personnel's office.\
    \ Any demoted crewmember must return all equipment and non-personal items to their previous department, including departmental jumpsuits and radios. If a demoted \ @@ -88,21 +88,21 @@ may treat said items as stolen.\
    \

    Chain of Command & Succession

    \ - In case of emergency or other need, and in the absence of a Station Director, an Acting Director may be selected from active, certified Command crew. \ - The selected individual has the same responsibility and authority as a certified Station Director, along with that of their regular position, with the assumption that \ - they will step down if a certified Station Director arrives on station. This role is entirely voluntary, and no Command crew may be forced into the role \ + In case of emergency or other need, and in the absence of a " + JOB_SITE_MANAGER + ", an Acting Director may be selected from active, certified Command crew. \ + The selected individual has the same responsibility and authority as a certified " + JOB_SITE_MANAGER + ", along with that of their regular position, with the assumption that \ + they will step down if a certified " + JOB_SITE_MANAGER + " arrives on station. This role is entirely voluntary, and no Command crew may be forced into the role \ if they are opposed to doing so.\
    \ The preferred order of selecting an Acting Director is as follows:
    \ The role is to be offered to the Head of Personnel, if one is present. If there is no Head of Personnel, or they are unwilling to assume Acting Director, the \ - position is offered to non-Security Command crew. If no other Command crew is available or willing to assume Acting Director, the Head of Security may be offered \ + position is offered to non-Security Command crew. If no other Command crew is available or willing to assume Acting Director, the " + JOB_HEAD_OF_SECURITY + " may be offered \ the position. If no other Command crew is available or willing to assume Acting Director, no Acting Director is selected. Acting Command may not be offered or accept \ Acting Director.\
    \

    Command Crew Demotions

    \ - If a member of the Command crew is suspected to be incompetent, or in breach of SOP, the Station Director has discretion to demote the guilty Command crewmember. \ - If there is no Station Director, or the Station Director themselves is guilty, they may be demoted after a vote of no confidence by the remaining Command crew \ - and relevant station crew. For the Station Director, the vote is only to be among the remaining Command crew. Misuse of this privilage may warrant an \ + If a member of the Command crew is suspected to be incompetent, or in breach of SOP, the " + JOB_SITE_MANAGER + " has discretion to demote the guilty Command crewmember. \ + If there is no " + JOB_SITE_MANAGER + ", or the " + JOB_SITE_MANAGER + " themselves is guilty, they may be demoted after a vote of no confidence by the remaining Command crew \ + and relevant station crew. For the " + JOB_SITE_MANAGER + ", the vote is only to be among the remaining Command crew. Misuse of this privilage may warrant an \ Internal Affairs investigation for wrongful dismissal.\
    \

    Communications with Central Command

    \ @@ -202,8 +202,8 @@
    \

    Cloning Procedure

    \ Persons whom have committed suicide are not to be cloned. Individuals are also to not be cloned if there is a Do Not Clone (generally referred \ - to as DNC) order in their medical records, or if the individual has had a DNC order declared against them by the Station Director, Chief \ - Medical Officer, or Head of Security. If any of this occurs, procede to Portmortem Storage.\ + to as DNC) order in their medical records, or if the individual has had a DNC order declared against them by the " + JOB_SITE_MANAGER + ", Chief \ + Medical Officer, or " + JOB_HEAD_OF_SECURITY + ". If any of this occurs, procede to Portmortem Storage.\
    \ Some individuals may have special instructions in their Postmortem Instructions, generally found in their medical records. \ Be sure to read them before committing to cloning someone. In particular, some instructions may express a desire to be placed \ @@ -291,7 +291,7 @@

    Exosuits & Prosthetics

    \ Exosuits (also known as Mecha, or Mechs) are large machines piloted by an individual. Construction of exosuits is to occur inside Robotics or the \ Mech Bay. Damaged exosuits should be repaired by Robotics. Civilian Exosuits (Ripley, Odysseus) may be built at the request of departmental crew. \ - Combat exosuits (Durand, Gygax) may not be built without permission from the Head of Security or Station Director.\ + Combat exosuits (Durand, Gygax) may not be built without permission from the " + JOB_HEAD_OF_SECURITY + " or " + JOB_SITE_MANAGER + ".\
    \ Robotics is also tasked with the repair of prostheses limbs. Robotics may also be tasked with installing a prosthetic, however the Medical team \ may also do this if the Robotics staff lack the training to do so." @@ -319,7 +319,7 @@

    Crew

    \ Crew members and visitors may freely walk in the hallways and other public areas. Suit sensors are recommended, but not mandatory. \ The Security team must respect the privacy of crew members and visitors, and no unauthorized searches are allowed. Searches of any kind may \ - only be done with the consent of the searched, or with a signed warrant by the Head of Security or Station Director. A warrant is not required \ + only be done with the consent of the searched, or with a signed warrant by the " + JOB_HEAD_OF_SECURITY + " or " + JOB_SITE_MANAGER + ". A warrant is not required \ for instances of visible contraband." /datum/lore/codex/page/blue diff --git a/code/modules/lore_codex/legal_code_data/sop/medical.dm b/code/modules/lore_codex/legal_code_data/sop/medical.dm index 29ba57e6e3..fe6f5b4d28 100644 --- a/code/modules/lore_codex/legal_code_data/sop/medical.dm +++ b/code/modules/lore_codex/legal_code_data/sop/medical.dm @@ -31,7 +31,7 @@ data = "Persons whom have committed suicide are not to be cloned, without authorization from the Chief Medical Officer. \ The Chief Medical Officer is fully responsible if they choose to clone a person whom has committed suicide. \ Individuals are also to not be cloned if there is a Do Not Clone (generally referred to as DNC) order in their medical records, \ - or if the individual has had a DNC order declared against them by the Station Director, Chief Medical Officer, or Head of Security. \ + or if the individual has had a DNC order declared against them by the " + JOB_SITE_MANAGER + ", Chief Medical Officer, or " + JOB_HEAD_OF_SECURITY + ". \ If any of this occurs, procede to Portmortem Storage.\

    \ Some individuals may have special instructions in their Postmortem Instructions, generally found in their medical records. \ @@ -70,4 +70,4 @@ data = "If a room becomes breached, the first priority is to evacuate any crewmembers and guests endangered by the breach, especially if they lack an EVA \ suit. Emergency softsuits are available in cyan colored lockers at key locations on your facility, if an untrained person requires short term EVA \ capability. Those exposed to vacuum without protection will almost certainly require advanced medical care, so bring anyone harmed to Medical. \ - Remember to avoid risking your own life, as stated in the Triage section." \ No newline at end of file + Remember to avoid risking your own life, as stated in the Triage section." diff --git a/code/modules/lore_codex/legal_code_data/sop/security.dm b/code/modules/lore_codex/legal_code_data/sop/security.dm index ca52d76529..594af5d6c7 100644 --- a/code/modules/lore_codex/legal_code_data/sop/security.dm +++ b/code/modules/lore_codex/legal_code_data/sop/security.dm @@ -31,7 +31,7 @@ /datum/lore/codex/page/sop_processing name = "Processing" - data = "Processing is the responsibility of the Arresting Officer, or the Warden if the Warden chooses to do so. The suspect is to be informed \ + data = "Processing is the responsibility of the Arresting Officer, or the " + JOB_WARDEN + " if the " + JOB_WARDEN + " chooses to do so. The suspect is to be informed \ again of the cause for their arrest, and that they will be searched. Suspects are assumed to be innocent until they are proven guilty. \ They are to be thoroughly searched. They may not be stripped of their inner clothing, though pockets are to be emptied. \ Any and all found contraband is to be confiscated, and anything that may be used to escape the brig is to be confiscated until the suspect's release.\ @@ -39,7 +39,7 @@ Assess the suspect's guilt. Contraband found in the search may be used as evidence at the discretion of the Arresting Officer. If the \ suspect is found innocent, all non-contraband is to be returned to them, and they are to be released. If instead they are found guilty and \ brig time is required by the type of violation they are guilty of, or have chosen brig time as an alternative to a fine if possible, they \ - are now considered a Prisoner, and further processing is the responsibility of the Warden, if one is present. If no Warden is present, the \ + are now considered a Prisoner, and further processing is the responsibility of the " + JOB_WARDEN + ", if one is present. If no " + JOB_WARDEN + " is present, the \ Arresting Officer is to continue processing.\

    \ The Prisoner is to be informed of their Sentencing Options, if available. These will vary depending on the violation in question, and \ @@ -58,13 +58,13 @@ department channels are to have their radio replaced with a general use radio. The prisoner's possessions are to be placed in the cell's locker, \ which will open upon their release.\

    \ - The Warden or processing officer is to set the cell timer, uncuff the Prisoner, and exit the cell, in any order desired. If the Prisoner is non-compliant, the Warden can activate \ - the cell's mounted flash, to incapacitate the Prisoner. The Warden may use up to Less-than-Lethal force to Prisoners resisting. Once the \ - Prisoner is secure, and the handcuffs recovered, the Warden may elect to open the communal brig for said prisoner. It is recommended to do this. If multiple Prisoners are present, \ - the Warden is to assess the threat posed by all prisoners as a group, to the Security team and to themselves, before allowing any Prisoner to access \ + The " + JOB_WARDEN + " or processing officer is to set the cell timer, uncuff the Prisoner, and exit the cell, in any order desired. If the Prisoner is non-compliant, the " + JOB_WARDEN + " can activate \ + the cell's mounted flash, to incapacitate the Prisoner. The " + JOB_WARDEN + " may use up to Less-than-Lethal force to Prisoners resisting. Once the \ + Prisoner is secure, and the handcuffs recovered, the " + JOB_WARDEN + " may elect to open the communal brig for said prisoner. It is recommended to do this. If multiple Prisoners are present, \ + the " + JOB_WARDEN + " is to assess the threat posed by all prisoners as a group, to the Security team and to themselves, before allowing any Prisoner to access \ the communal brig.\

    \ - The Warden is to check in on all prisoners frequently, to ensure they remain contained and healthy. This can be accomplished with the use of \ + The " + JOB_WARDEN + " is to check in on all prisoners frequently, to ensure they remain contained and healthy. This can be accomplished with the use of \ cameras. They are to also keep track of the sentencing time for all their prisoners, and be on location to escort them out of the brig when \ their time is up and they have returned to their normal clothing. The Prisoner's possessions are to be returned to the Prisoner at this time, and \ their security record must be set to Released." @@ -73,7 +73,7 @@ name = "Solitary Confinement" data = "Solitary confinement is only to be used with prisoners possessing Hold until Transfer sentences that cannot be trusted with access to the normal \ brig, due to attempts at escaping, or posing a threat to other prisoners, or themselves. A prisoner is to never be placed inside Solitary as a first course of \ - action. Prisoners inside Solitary are to still be checked up on by the Warden." + action. Prisoners inside Solitary are to still be checked up on by the " + JOB_WARDEN + "." // Sad that we need this page to exist. /datum/lore/codex/page/sop_prisoner_rights @@ -91,10 +91,10 @@ be returned if there is no pressing need for them to be deployed.\
    \ For Blue, Security may have weapons visible, but not drawn unless needed. Body armor and helmets are recommended bot not mandatory. \ - Weaponry and specialized armor are allowed to be given out to security officers, with clearance from the Warden or Head of Security.\ + Weaponry and specialized armor are allowed to be given out to security officers, with clearance from the " + JOB_WARDEN + " or " + JOB_HEAD_OF_SECURITY + ".\
    \ For Red, Security may have weapons drawn at all times, however properly handling of weapons should not be disregarded. Body armor and \ - helmets are mandatory. Specialized armor may be distributed by the Warden and Head of Security, when appropriate." + helmets are mandatory. Specialized armor may be distributed by the " + JOB_WARDEN + " and " + JOB_HEAD_OF_SECURITY + ", when appropriate." /datum/lore/codex/page/sop_escalation name = "Escalation of Force" diff --git a/code/modules/lore_codex/news_data/main.dm b/code/modules/lore_codex/news_data/main.dm index 8f3061f38a..088d0bba6e 100644 --- a/code/modules/lore_codex/news_data/main.dm +++ b/code/modules/lore_codex/news_data/main.dm @@ -947,12 +947,12 @@ Shelf, a largely Positronic colony fleet, consists of over 1700 vessels including the 'One Leaky Bitch', current headquarters of Morpheus Shelf, Morpheus' non-Solar 'spin-out' corporation established last June. The fleet has continuously denied direct affiliation with the Almach Assocation, but was involved in a major drone attack on Solar vessels just nine months ago, which was claimed to be 'in error'." /datum/lore/codex/page/article80 - name = "02/12/64 - Spectralist Wardens to hold Vigils for Lost Fleet" - data = "In the wake of Shelf's sudden disappearence, Wardens across SolGov space have collectively agreed to hold services and vigils throughout dozens of systems for those who are doubtless worried for their loved ones aboard the missing ships. Spectralism, a synthetic-centric religion, finds it's roots within 'Haven', a small vessel and community that travels alongside the wider Shelf fleet, though considers itself a distinct entity. Its ministers, known as Wardens, tend to its adherants wherever they may be found.\ + name = "02/12/64 - Spectralist " + JOB_WARDEN + "s to hold Vigils for Lost Fleet" + data = "In the wake of Shelf's sudden disappearence, " + JOB_WARDEN + "s across SolGov space have collectively agreed to hold services and vigils throughout dozens of systems for those who are doubtless worried for their loved ones aboard the missing ships. Spectralism, a synthetic-centric religion, finds it's roots within 'Haven', a small vessel and community that travels alongside the wider Shelf fleet, though considers itself a distinct entity. Its ministers, known as " + JOB_WARDEN + "s, tend to its adherants wherever they may be found.\

    \ Despite Haven's well-known and somewhat-controversial independence of identity from Shelf, all indications point to the Fleet's disappearance having taken the attached ship with it. All twelve Spectralist Elders are known to have been onboard Haven at the time of its disappearance, as well as numerous other significant Spectralists and other spiritual leaders thought to have been on Shelf. The potential loss of the entire upper organizational body could be devastating to the religion, who have long been instrumental in the synthetic rights movement.\

    \ - Ceramica, a Warden operating out of Nyx, reached out for comment with the following: 'We are as worried as everyone else who calls Shelf their home, or who has lost contact with friends or family. You need not believe in the First Spark to have a place at your local vigil; We welcome everyone who may be hurting. This is our way, this has always been our way. We remind everyone to stay mindful, and to reach out to those you see struggling. In times like this, we cannot leave each other behind.'" + Ceramica, a " + JOB_WARDEN + " operating out of Nyx, reached out for comment with the following: 'We are as worried as everyone else who calls Shelf their home, or who has lost contact with friends or family. You need not believe in the First Spark to have a place at your local vigil; We welcome everyone who may be hurting. This is our way, this has always been our way. We remind everyone to stay mindful, and to reach out to those you see struggling. In times like this, we cannot leave each other behind.'" /datum/lore/codex/page/article81 name = "02/14/64 - Shelf Safe After 'Impossible' Jump!" diff --git a/code/modules/mob/living/silicon/laws.dm b/code/modules/mob/living/silicon/laws.dm index 41b0c5d151..32b3919eb2 100644 --- a/code/modules/mob/living/silicon/laws.dm +++ b/code/modules/mob/living/silicon/laws.dm @@ -141,7 +141,7 @@ continue players += player.real_name - var/random_player = "The Site Manager" + var/random_player = "The " + JOB_SITE_MANAGER if(players.len && !exclude_crew_names) random_player = pick(players) //Random player's name, to be used in laws. diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/fox_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/fox_vr.dm index 22bf26bf86..d05af3dc43 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/pets/fox_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/fox_vr.dm @@ -188,7 +188,7 @@ //Captain fox /mob/living/simple_mob/animal/passive/fox/renault name = "Renault" - desc = "Renault, the Site Manager's trustworthy fox. I wonder what it says?" + desc = "Renault, the " + JOB_SITE_MANAGER + "'s trustworthy fox. I wonder what it says?" tt_desc = "Vulpes nobilis" //befriend_job = "Site Manager" Sebbe edit: couldn't make this work, commenting out for now. diff --git a/code/modules/mob/new_player/skill.dm b/code/modules/mob/new_player/skill.dm index e1a0b50b7f..ac089a1d76 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("Engineer" = SKILL_ENGINEER, "Roboticist" = SKILL_ORGAN_ROBOTICIST, "Security Officer" = SKILL_SECURITY_OFFICER, "Chemist" = SKILL_CHEMIST) +var/global/list/SKILL_PRE = list("Engineer" = SKILL_ENGINEER, "Roboticist" = SKILL_ORGAN_ROBOTICIST, JOB_SECURITY_OFFICER = SKILL_SECURITY_OFFICER, "Chemist" = SKILL_CHEMIST) /datum/skill/management ID = "management" diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm index 05c0b0a289..41727e835a 100644 --- a/code/modules/paperwork/folders.dm +++ b/code/modules/paperwork/folders.dm @@ -26,7 +26,7 @@ icon_state = "folder_white" /obj/item/weapon/folder/blue_captain - desc = "A blue folder with Site Manager markings." + desc = "A blue folder with " + JOB_SITE_MANAGER + " markings." icon_state = "folder_captain" /obj/item/weapon/folder/blue_hop diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index cf74c4ec64..55546b3c22 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -662,7 +662,7 @@ /obj/item/weapon/paper/courtroom name = "A Crash Course in Legal SOP on SS13" - info = "Roles:
    \nThe Detective is basically the investigator and prosecutor.
    \nThe Staff Assistant can perform these functions with written authority from the Detective.
    \nThe Site Manager/HoP/Warden is ct as the judicial authority.
    \nThe Security Officers are responsible for executing warrants, security during trial, and prisoner transport.
    \n
    \nInvestigative Phase:
    \nAfter the crime has been committed the Detective's job is to gather evidence and try to ascertain not only who did it but what happened. He must take special care to catalogue everything and don't leave anything out. Write out all the evidence on paper. Make sure you take an appropriate number of fingerprints. IF he must ask someone questions he has permission to confront them. If the person refuses he can ask a judicial authority to write a subpoena for questioning. If again he fails to respond then that person is to be jailed as insubordinate and obstructing justice. Said person will be released after he cooperates.
    \n
    \nONCE the FT has a clear idea as to who the criminal is he is to write an arrest warrant on the piece of paper. IT MUST LIST THE CHARGES. The FT is to then go to the judicial authority and explain a small version of his case. If the case is moderately acceptable the authority should sign it. Security must then execute said warrant.
    \n
    \nPre-Pre-Trial Phase:
    \nNow a legal representative must be presented to the defendant if said defendant requests one. That person and the defendant are then to be given time to meet (in the jail IS ACCEPTABLE). The defendant and his lawyer are then to be given a copy of all the evidence that will be presented at trial (rewriting it all on paper is fine). THIS IS CALLED THE DISCOVERY PACK. With a few exceptions, THIS IS THE ONLY EVIDENCE BOTH SIDES MAY USE AT TRIAL. IF the prosecution will be seeking the death penalty it MUST be stated at this time. ALSO if the defense will be seeking not guilty by mental defect it must state this at this time to allow ample time for examination.
    \nNow at this time each side is to compile a list of witnesses. By default, the defendant is on both lists regardless of anything else. Also the defense and prosecution can compile more evidence beforehand BUT in order for it to be used the evidence MUST also be given to the other side.\nThe defense has time to compile motions against some evidence here.
    \nPossible Motions:
    \n1. Invalidate Evidence- Something with the evidence is wrong and the evidence is to be thrown out. This includes irrelevance or corrupt security.
    \n2. Free Movement- Basically the defendant is to be kept uncuffed before and during the trial.
    \n3. Subpoena Witness- If the defense presents god reasons for needing a witness but said person fails to cooperate then a subpoena is issued.
    \n4. Drop the Charges- Not enough evidence is there for a trial so the charges are to be dropped. The FT CAN RETRY but the judicial authority must carefully reexamine the new evidence.
    \n5. Declare Incompetent- Basically the defendant is insane. Once this is granted a medical official is to examine the patient. If he is indeed insane he is to be placed under care of the medical staff until he is deemed competent to stand trial.
    \n
    \nALL SIDES MOVE TO A COURTROOM
    \nPre-Trial Hearings:
    \nA judicial authority and the 2 sides are to meet in the trial room. NO ONE ELSE BESIDES A SECURITY DETAIL IS TO BE PRESENT. The defense submits a plea. If the plea is guilty then proceed directly to sentencing phase. Now the sides each present their motions to the judicial authority. He rules on them. Each side can debate each motion. Then the judicial authority gets a list of crew members. He first gets a chance to look at them all and pick out acceptable and available jurors. Those jurors are then called over. Each side can ask a few questions and dismiss jurors they find too biased. HOWEVER before dismissal the judicial authority MUST agree to the reasoning.
    \n
    \nThe Trial:
    \nThe trial has three phases.
    \n1. Opening Arguments- Each side can give a short speech. They may not present ANY evidence.
    \n2. Witness Calling/Evidence Presentation- The prosecution goes first and is able to call the witnesses on his approved list in any order. He can recall them if necessary. During the questioning the lawyer may use the evidence in the questions to help prove a point. After every witness the other side has a chance to cross-examine. After both sides are done questioning a witness the prosecution can present another or recall one (even the EXACT same one again!). After prosecution is done the defense can call witnesses. After the initial cases are presented both sides are free to call witnesses on either list.
    \nFINALLY once both sides are done calling witnesses we move onto the next phase.
    \n3. Closing Arguments- Same as opening.
    \nThe jury then deliberates IN PRIVATE. THEY MUST ALL AGREE on a verdict. REMEMBER: They mix between some charges being guilty and others not guilty (IE if you supposedly killed someone with a gun and you unfortunately picked up a gun without authorization then you CAN be found not guilty of murder BUT guilty of possession of illegal weaponry.). Once they have agreed they present their verdict. If unable to reach a verdict and feel they will never they call a deadlocked jury and we restart at Pre-Trial phase with an entirely new set of jurors.
    \n
    \nSentencing Phase:
    \nIf the death penalty was sought (you MUST have gone through a trial for death penalty) then skip to the second part.
    \nI. Each side can present more evidence/witnesses in any order. There is NO ban on emotional aspects or anything. The prosecution is to submit a suggested penalty. After all the sides are done then the judicial authority is to give a sentence.
    \nII. The jury stays and does the same thing as I. Their sole job is to determine if the death penalty is applicable. If NOT then the judge selects a sentence.
    \n
    \nTADA you're done. Security then executes the sentence and adds the applicable convictions to the person's record.
    \n" + info = "Roles:
    \nThe " + JOB_DETECTIVE + " is basically the investigator and prosecutor.
    \nThe Staff Assistant can perform these functions with written authority from the " + JOB_DETECTIVE + ".
    \nThe " + JOB_SITE_MANAGER + "/HoP/" + JOB_WARDEN + " is ct as the judicial authority.
    \nThe " + JOB_SECURITY_OFFICER + "s are responsible for executing warrants, security during trial, and prisoner transport.
    \n
    \nInvestigative Phase:
    \nAfter the crime has been committed the " + JOB_DETECTIVE + "'s job is to gather evidence and try to ascertain not only who did it but what happened. He must take special care to catalogue everything and don't leave anything out. Write out all the evidence on paper. Make sure you take an appropriate number of fingerprints. IF he must ask someone questions he has permission to confront them. If the person refuses he can ask a judicial authority to write a subpoena for questioning. If again he fails to respond then that person is to be jailed as insubordinate and obstructing justice. Said person will be released after he cooperates.
    \n
    \nONCE the FT has a clear idea as to who the criminal is he is to write an arrest warrant on the piece of paper. IT MUST LIST THE CHARGES. The FT is to then go to the judicial authority and explain a small version of his case. If the case is moderately acceptable the authority should sign it. Security must then execute said warrant.
    \n
    \nPre-Pre-Trial Phase:
    \nNow a legal representative must be presented to the defendant if said defendant requests one. That person and the defendant are then to be given time to meet (in the jail IS ACCEPTABLE). The defendant and his lawyer are then to be given a copy of all the evidence that will be presented at trial (rewriting it all on paper is fine). THIS IS CALLED THE DISCOVERY PACK. With a few exceptions, THIS IS THE ONLY EVIDENCE BOTH SIDES MAY USE AT TRIAL. IF the prosecution will be seeking the death penalty it MUST be stated at this time. ALSO if the defense will be seeking not guilty by mental defect it must state this at this time to allow ample time for examination.
    \nNow at this time each side is to compile a list of witnesses. By default, the defendant is on both lists regardless of anything else. Also the defense and prosecution can compile more evidence beforehand BUT in order for it to be used the evidence MUST also be given to the other side.\nThe defense has time to compile motions against some evidence here.
    \nPossible Motions:
    \n1. Invalidate Evidence- Something with the evidence is wrong and the evidence is to be thrown out. This includes irrelevance or corrupt security.
    \n2. Free Movement- Basically the defendant is to be kept uncuffed before and during the trial.
    \n3. Subpoena Witness- If the defense presents god reasons for needing a witness but said person fails to cooperate then a subpoena is issued.
    \n4. Drop the Charges- Not enough evidence is there for a trial so the charges are to be dropped. The FT CAN RETRY but the judicial authority must carefully reexamine the new evidence.
    \n5. Declare Incompetent- Basically the defendant is insane. Once this is granted a medical official is to examine the patient. If he is indeed insane he is to be placed under care of the medical staff until he is deemed competent to stand trial.
    \n
    \nALL SIDES MOVE TO A COURTROOM
    \nPre-Trial Hearings:
    \nA judicial authority and the 2 sides are to meet in the trial room. NO ONE ELSE BESIDES A SECURITY DETAIL IS TO BE PRESENT. The defense submits a plea. If the plea is guilty then proceed directly to sentencing phase. Now the sides each present their motions to the judicial authority. He rules on them. Each side can debate each motion. Then the judicial authority gets a list of crew members. He first gets a chance to look at them all and pick out acceptable and available jurors. Those jurors are then called over. Each side can ask a few questions and dismiss jurors they find too biased. HOWEVER before dismissal the judicial authority MUST agree to the reasoning.
    \n
    \nThe Trial:
    \nThe trial has three phases.
    \n1. Opening Arguments- Each side can give a short speech. They may not present ANY evidence.
    \n2. Witness Calling/Evidence Presentation- The prosecution goes first and is able to call the witnesses on his approved list in any order. He can recall them if necessary. During the questioning the lawyer may use the evidence in the questions to help prove a point. After every witness the other side has a chance to cross-examine. After both sides are done questioning a witness the prosecution can present another or recall one (even the EXACT same one again!). After prosecution is done the defense can call witnesses. After the initial cases are presented both sides are free to call witnesses on either list.
    \nFINALLY once both sides are done calling witnesses we move onto the next phase.
    \n3. Closing Arguments- Same as opening.
    \nThe jury then deliberates IN PRIVATE. THEY MUST ALL AGREE on a verdict. REMEMBER: They mix between some charges being guilty and others not guilty (IE if you supposedly killed someone with a gun and you unfortunately picked up a gun without authorization then you CAN be found not guilty of murder BUT guilty of possession of illegal weaponry.). Once they have agreed they present their verdict. If unable to reach a verdict and feel they will never they call a deadlocked jury and we restart at Pre-Trial phase with an entirely new set of jurors.
    \n
    \nSentencing Phase:
    \nIf the death penalty was sought (you MUST have gone through a trial for death penalty) then skip to the second part.
    \nI. Each side can present more evidence/witnesses in any order. There is NO ban on emotional aspects or anything. The prosecution is to submit a suggested penalty. After all the sides are done then the judicial authority is to give a sentence.
    \nII. The jury stays and does the same thing as I. Their sole job is to determine if the death penalty is applicable. If NOT then the judge selects a sentence.
    \n
    \nTADA you're done. Security then executes the sentence and adds the applicable convictions to the person's record.
    \n" /obj/item/weapon/paper/hydroponics name = "Greetings from Billy Bob" @@ -679,7 +679,7 @@ /obj/item/weapon/paper/jobs name = "Job Information" - info = "Information on all formal jobs that can be assigned on Space Station 13 can be found on this document.
    \nThe data will be in the following form.
    \nGenerally lower ranking positions come first in this list.
    \n
    \nJob Name general access>lab access-engine access-systems access (atmosphere control)
    \n\tJob Description
    \nJob Duties (in no particular order)
    \nTips (where applicable)
    \n
    \nResearch Assistant 1>1-0-0
    \n\tThis is probably the lowest level position. Anyone who enters the space station after the initial job\nassignment will automatically receive this position. Access with this is restricted. Head of Personnel should\nappropriate the correct level of assistance.
    \n1. Assist the researchers.
    \n2. Clean up the labs.
    \n3. Prepare materials.
    \n
    \nStaff Assistant 2>0-0-0
    \n\tThis position assists the security officer in his duties. The staff assisstants should primarily br\npatrolling the ship waiting until they are needed to maintain ship safety.\n(Addendum: Updated/Elevated Security Protocols admit issuing of low level weapons to security personnel)
    \n1. Patrol ship/Guard key areas
    \n2. Assist security officer
    \n3. Perform other security duties.
    \n
    \nTechnical Assistant 1>0-0-1
    \n\tThis is yet another low level position. The technical assistant helps the engineer and the statian\ntechnician with the upkeep and maintenance of the station. This job is very important because it usually\ngets to be a heavy workload on station technician and these helpers will alleviate that.
    \n1. Assist Station technician and Engineers.
    \n2. Perform general maintenance of station.
    \n3. Prepare materials.
    \n
    \nMedical Assistant 1>1-0-0
    \n\tThis is the fourth position yet it is slightly less common. This position doesn't have much power\noutside of the med bay. Consider this position like a nurse who helps to upkeep medical records and the\nmaterials (filling syringes and checking vitals)
    \n1. Assist the medical personnel.
    \n2. Update medical files.
    \n3. Prepare materials for medical operations.
    \n
    \nResearch Technician 2>3-0-0
    \n\tThis job is primarily a step up from research assistant. These people generally do not get their own lab\nbut are more hands on in the experimentation process. At this level they are permitted to work as consultants to\nthe others formally.
    \n1. Inform superiors of research.
    \n2. Perform research alongside of official researchers.
    \n
    \nDetective 3>2-0-0
    \n\tThis job is in most cases slightly boring at best. Their sole duty is to\nperform investigations of crine scenes and analysis of the crime scene. This\nalleviates SOME of the burden from the security officer. This person's duty\nis to draw conclusions as to what happened and testify in court. Said person\nalso should stroe the evidence ly.
    \n1. Perform crime-scene investigations/draw conclusions.
    \n2. Store and catalogue evidence properly.
    \n3. Testify to superiors/inquieries on findings.
    \n
    \nStation Technician 2>0-2-3
    \n\tPeople assigned to this position must work to make sure all the systems aboard Space Station 13 are operable.\nThey should primarily work in the computer lab and repairing faulty equipment. They should work with the\natmospheric technician.
    \n1. Maintain SS13 systems.
    \n2. Repair equipment.
    \n
    \nAtmospheric Technician 3>0-0-4
    \n\tThese people should primarily work in the atmospheric control center and lab. They have the very important\njob of maintaining the delicate atmosphere on SS13.
    \n1. Maintain atmosphere on SS13
    \n2. Research atmospheres on the space station. (safely please!)
    \n
    \nEngineer 2>1-3-0
    \n\tPeople working as this should generally have detailed knowledge as to how the propulsion systems on SS13\nwork. They are one of the few classes that have unrestricted access to the engine area.
    \n1. Upkeep the engine.
    \n2. Prevent fires in the engine.
    \n3. Maintain a safe orbit.
    \n
    \nMedical Researcher 2>5-0-0
    \n\tThis position may need a little clarification. Their duty is to make sure that all experiments are safe and\nto conduct experiments that may help to improve the station. They will be generally idle until a new laboratory\nis constructed.
    \n1. Make sure the station is kept safe.
    \n2. Research medical properties of materials studied of Space Station 13.
    \n
    \nScientist 2>5-0-0
    \n\tThese people study the properties, particularly the toxic properties, of materials handled on SS13.\nTechnically they can also be called Phoron Technicians as phoron is the material they routinly handle.
    \n1. Research phoron
    \n2. Make sure all phoron is properly handled.
    \n
    \nMedical Doctor (Officer) 2>0-0-0
    \n\tPeople working this job should primarily stay in the medical area. They should make sure everyone goes to\nthe medical bay for treatment and examination. Also they should make sure that medical supplies are kept in\norder.
    \n1. Heal wounded people.
    \n2. Perform examinations of all personnel.
    \n3. Moniter usage of medical equipment.
    \n
    \nSecurity Officer 3>0-0-0
    \n\tThese people should attempt to keep the peace inside the station and make sure the station is kept safe. One\nside duty is to assist in repairing the station. They also work like general maintenance personnel. They are not\ngiven a weapon and must use their own resources.
    \n(Addendum: Updated/Elevated Security Protocols admit issuing of weapons to security personnel)
    \n1. Maintain order.
    \n2. Assist others.
    \n3. Repair structural problems.
    \n
    \nHead of Security 4>5-2-2
    \n\tPeople assigned as Head of Security should issue orders to the security staff. They should\nalso carefully moderate the usage of all security equipment. All security matters should be reported to this person.
    \n1. Oversee security.
    \n2. Assign patrol duties.
    \n3. Protect the station and staff.
    \n
    \nHead of Personnel 4>4-2-2
    \n\tPeople assigned as head of personnel will find themselves moderating all actions done by personnel. \nAlso they have the ability to assign jobs and access levels.
    \n1. Assign duties.
    \n2. Moderate personnel.
    \n3. Moderate research.
    \n
    \nSite Manager 5>5-5-5 (unrestricted station wide access)
    \n\tThis is the highest position youi can aquire on Space Station 13. They are allowed anywhere inside the\nspace station and therefore should protect their ID card. They also have the ability to assign positions\nand access levels. They should not abuse their power.
    \n1. Assign all positions on SS13
    \n2. Inspect the station for any problems.
    \n3. Perform administrative duties.
    \n" + info = "Information on all formal jobs that can be assigned on Space Station 13 can be found on this document.
    \nThe data will be in the following form.
    \nGenerally lower ranking positions come first in this list.
    \n
    \nJob Name general access>lab access-engine access-systems access (atmosphere control)
    \n\tJob Description
    \nJob Duties (in no particular order)
    \nTips (where applicable)
    \n
    \nResearch Assistant 1>1-0-0
    \n\tThis is probably the lowest level position. Anyone who enters the space station after the initial job\nassignment will automatically receive this position. Access with this is restricted. Head of Personnel should\nappropriate the correct level of assistance.
    \n1. Assist the researchers.
    \n2. Clean up the labs.
    \n3. Prepare materials.
    \n
    \nStaff Assistant 2>0-0-0
    \n\tThis position assists the security officer in his duties. The staff assisstants should primarily br\npatrolling the ship waiting until they are needed to maintain ship safety.\n(Addendum: Updated/Elevated Security Protocols admit issuing of low level weapons to security personnel)
    \n1. Patrol ship/Guard key areas
    \n2. Assist security officer
    \n3. Perform other security duties.
    \n
    \nTechnical Assistant 1>0-0-1
    \n\tThis is yet another low level position. The technical assistant helps the engineer and the statian\ntechnician with the upkeep and maintenance of the station. This job is very important because it usually\ngets to be a heavy workload on station technician and these helpers will alleviate that.
    \n1. Assist Station technician and Engineers.
    \n2. Perform general maintenance of station.
    \n3. Prepare materials.
    \n
    \nMedical Assistant 1>1-0-0
    \n\tThis is the fourth position yet it is slightly less common. This position doesn't have much power\noutside of the med bay. Consider this position like a nurse who helps to upkeep medical records and the\nmaterials (filling syringes and checking vitals)
    \n1. Assist the medical personnel.
    \n2. Update medical files.
    \n3. Prepare materials for medical operations.
    \n
    \nResearch Technician 2>3-0-0
    \n\tThis job is primarily a step up from research assistant. These people generally do not get their own lab\nbut are more hands on in the experimentation process. At this level they are permitted to work as consultants to\nthe others formally.
    \n1. Inform superiors of research.
    \n2. Perform research alongside of official researchers.
    \n
    \n" + JOB_DETECTIVE + " 3>2-0-0
    \n\tThis job is in most cases slightly boring at best. Their sole duty is to\nperform investigations of crine scenes and analysis of the crime scene. This\nalleviates SOME of the burden from the security officer. This person's duty\nis to draw conclusions as to what happened and testify in court. Said person\nalso should stroe the evidence ly.
    \n1. Perform crime-scene investigations/draw conclusions.
    \n2. Store and catalogue evidence properly.
    \n3. Testify to superiors/inquieries on findings.
    \n
    \nStation Technician 2>0-2-3
    \n\tPeople assigned to this position must work to make sure all the systems aboard Space Station 13 are operable.\nThey should primarily work in the computer lab and repairing faulty equipment. They should work with the\natmospheric technician.
    \n1. Maintain SS13 systems.
    \n2. Repair equipment.
    \n
    \nAtmospheric Technician 3>0-0-4
    \n\tThese people should primarily work in the atmospheric control center and lab. They have the very important\njob of maintaining the delicate atmosphere on SS13.
    \n1. Maintain atmosphere on SS13
    \n2. Research atmospheres on the space station. (safely please!)
    \n
    \nEngineer 2>1-3-0
    \n\tPeople working as this should generally have detailed knowledge as to how the propulsion systems on SS13\nwork. They are one of the few classes that have unrestricted access to the engine area.
    \n1. Upkeep the engine.
    \n2. Prevent fires in the engine.
    \n3. Maintain a safe orbit.
    \n
    \nMedical Researcher 2>5-0-0
    \n\tThis position may need a little clarification. Their duty is to make sure that all experiments are safe and\nto conduct experiments that may help to improve the station. They will be generally idle until a new laboratory\nis constructed.
    \n1. Make sure the station is kept safe.
    \n2. Research medical properties of materials studied of Space Station 13.
    \n
    \nScientist 2>5-0-0
    \n\tThese people study the properties, particularly the toxic properties, of materials handled on SS13.\nTechnically they can also be called Phoron Technicians as phoron is the material they routinly handle.
    \n1. Research phoron
    \n2. Make sure all phoron is properly handled.
    \n
    \nMedical Doctor (Officer) 2>0-0-0
    \n\tPeople working this job should primarily stay in the medical area. They should make sure everyone goes to\nthe medical bay for treatment and examination. Also they should make sure that medical supplies are kept in\norder.
    \n1. Heal wounded people.
    \n2. Perform examinations of all personnel.
    \n3. Moniter usage of medical equipment.
    \n
    \n" + JOB_SECURITY_OFFICER + " 3>0-0-0
    \n\tThese people should attempt to keep the peace inside the station and make sure the station is kept safe. One\nside duty is to assist in repairing the station. They also work like general maintenance personnel. They are not\ngiven a weapon and must use their own resources.
    \n(Addendum: Updated/Elevated Security Protocols admit issuing of weapons to security personnel)
    \n1. Maintain order.
    \n2. Assist others.
    \n3. Repair structural problems.
    \n
    \n" + JOB_HEAD_OF_SECURITY + " 4>5-2-2
    \n\tPeople assigned as " + JOB_HEAD_OF_SECURITY + " should issue orders to the security staff. They should\nalso carefully moderate the usage of all security equipment. All security matters should be reported to this person.
    \n1. Oversee security.
    \n2. Assign patrol duties.
    \n3. Protect the station and staff.
    \n
    \nHead of Personnel 4>4-2-2
    \n\tPeople assigned as head of personnel will find themselves moderating all actions done by personnel. \nAlso they have the ability to assign jobs and access levels.
    \n1. Assign duties.
    \n2. Moderate personnel.
    \n3. Moderate research.
    \n
    \n"+ JOB_SITE_MANAGER + " 5>5-5-5 (unrestricted station wide access)
    \n\tThis is the highest position youi can aquire on Space Station 13. They are allowed anywhere inside the\nspace station and therefore should protect their ID card. They also have the ability to assign positions\nand access levels. They should not abuse their power.
    \n1. Assign all positions on SS13
    \n2. Inspect the station for any problems.
    \n3. Perform administrative duties.
    \n" /obj/item/weapon/paper/photograph name = "photo" diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm index 6d0e90eea8..218b9919ba 100644 --- a/code/modules/projectiles/guns/energy/stun.dm +++ b/code/modules/projectiles/guns/energy/stun.dm @@ -148,7 +148,7 @@ var/mob/M = usr if(!M.mind) return 0 var/job = M.mind.assigned_role - if(job != "Detective" && job != "Security Officer" && job != "Warden" && job != "Head of Security") + if(job != JOB_DETECTIVE && job != JOB_SECURITY_OFFICER && job != JOB_WARDEN && job != JOB_HEAD_OF_SECURITY ) to_chat(M, "You don't feel cool enough to name this gun, chump.") return 0 diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm index cd9fde9bd8..a0853600fa 100644 --- a/code/modules/projectiles/guns/projectile/pistol.dm +++ b/code/modules/projectiles/guns/projectile/pistol.dm @@ -40,7 +40,7 @@ var/mob/M = usr if(!M.mind) return 0 var/job = M.mind.assigned_role - if(job != "Detective" && job != "Security Officer" && job != "Warden" && job != "Head of Security") + if(job != JOB_DETECTIVE && job != JOB_SECURITY_OFFICER && job != JOB_WARDEN && job != JOB_HEAD_OF_SECURITY ) to_chat(M, "You don't feel cool enough to name this gun, chump.") return 0 @@ -605,4 +605,4 @@ return var/ratio = ammo_magazine.stored_ammo.len * 100 / ammo_magazine.max_ammo ratio = round(ratio, 33) - add_overlay("lamia_[ratio]") \ No newline at end of file + add_overlay("lamia_[ratio]") diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index 77c211778d..d26ce740fc 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -63,7 +63,7 @@ var/mob/M = usr if(!M.mind) return 0 - if(!M.mind.assigned_role == "Detective") + if(!M.mind.assigned_role == JOB_DETECTIVE) to_chat(M, "You don't feel cool enough to name this gun, chump.") return 0 @@ -86,12 +86,12 @@ /obj/item/weapon/gun/projectile/revolver/detective45/verb/rename_gun() set name = "Name Gun" set category = "Object" - set desc = "Rename your gun. If you're the Detective." + set desc = "Rename your gun. If you're the " + JOB_DETECTIVE + "." var/mob/M = usr if(!M.mind) return 0 var/job = M.mind.assigned_role - if(job != "Detective") + if(job != JOB_DETECTIVE) to_chat(M, "You don't feel cool enough to name this gun, chump.") return 0 diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index 193b4d465e..fab16424b9 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -697,7 +697,7 @@ //HOS Hardsuit /obj/item/clothing/suit/space/void/security/fluff/hos // ToDo: Rig version. name = "\improper prototype voidsuit" - desc = "A customized security voidsuit made to match the Head of Security's obession with black. Has additional composite armor." + desc = "A customized security voidsuit made to match the " + JOB_HEAD_OF_SECURITY + "'s obession with black. Has additional composite armor." icon = 'icons/vore/custom_clothes_vr.dmi' icon_state = "rig-hos" @@ -710,7 +710,7 @@ //HOS Hardsuit Helmet /obj/item/clothing/head/helmet/space/void/security/fluff/hos // ToDo: Rig version. name = "\improper prototype voidsuit helmet" - desc = "A customized security voidsuit helmet customized to include the Head of Security's signature hat. Has additional composite armor." + desc = "A customized security voidsuit helmet customized to include the " + JOB_HEAD_OF_SECURITY + "'s signature hat. Has additional composite armor." icon = 'icons/vore/custom_clothes_vr.dmi' icon_state = "rig0-hos" diff --git a/maps/southern_cross/loadout/loadout_accessories.dm b/maps/southern_cross/loadout/loadout_accessories.dm index 3febe42b2e..fc7012cfea 100644 --- a/maps/southern_cross/loadout/loadout_accessories.dm +++ b/maps/southern_cross/loadout/loadout_accessories.dm @@ -1,34 +1,34 @@ /datum/gear/accessory/brown_vest display_name = "webbing, brown" path = /obj/item/clothing/accessory/storage/brown_vest - allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer",JOB_SECURITY_OFFICER,JOB_DETECTIVE,JOB_HEAD_OF_SECURITY,JOB_WARDEN,"Paramedic","Chief Medical Officer","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("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer",JOB_SECURITY_OFFICER,JOB_DETECTIVE,JOB_HEAD_OF_SECURITY,JOB_WARDEN,"Paramedic","Chief Medical Officer","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("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer",JOB_SECURITY_OFFICER,JOB_DETECTIVE,JOB_HEAD_OF_SECURITY,JOB_WARDEN,"Paramedic","Chief Medical Officer","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("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer",JOB_SECURITY_OFFICER,JOB_DETECTIVE,JOB_HEAD_OF_SECURITY,JOB_WARDEN,"Paramedic","Chief Medical Officer","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("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer",JOB_SECURITY_OFFICER,JOB_DETECTIVE,JOB_HEAD_OF_SECURITY,JOB_WARDEN,"Paramedic","Chief Medical Officer","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("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer",JOB_SECURITY_OFFICER,JOB_DETECTIVE,JOB_HEAD_OF_SECURITY,JOB_WARDEN,"Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer",JOB_SHAFT_MINER) /datum/gear/accessory/holster display_name = "holster selection (Security, CD, HoP)" path = /obj/item/clothing/accessory/holster - allowed_roles = list("Site Manager","Head of Personnel","Security Officer","Warden","Head of Security","Detective","Explorer") \ No newline at end of file + allowed_roles = list("Site Manager","Head of Personnel",JOB_SECURITY_OFFICER,JOB_WARDEN,JOB_HEAD_OF_SECURITY,JOB_DETECTIVE,"Explorer") diff --git a/vorestation.dme b/vorestation.dme index 2e4f1b0f3b..68830c2239 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -72,6 +72,7 @@ #include "code\__defines\is_helpers.dm" #include "code\__defines\items_clothing.dm" #include "code\__defines\job_controller.dm" +#include "code\__defines\jobs.dm" #include "code\__defines\jukebox.dm" #include "code\__defines\life.dm" #include "code\__defines\lighting.dm"
    Command
    SpecialSite Manager"+JOB_SITE_MANAGER+"Custom