diff --git a/code/__defines/jobs.dm b/code/__defines/jobs.dm index 4d2612c717..e28e1f06f7 100644 --- a/code/__defines/jobs.dm +++ b/code/__defines/jobs.dm @@ -1,18 +1,20 @@ -// Station ranks -#define RANK_HEADS "Heads" -#define RANK_SECURITY "Security" -#define RANK_ENGINEERING "Engineering" - - -// Main Station Jobs +// Station Command 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_CHIEF_ENGINEER "Chief Engineer" +#define JOB_RESEARCH_DIRECTOR "Research Director" + +// Station Security jobs #define JOB_WARDEN "Warden" #define JOB_DETECTIVE "Detective" #define JOB_SECURITY_OFFICER "Security Officer" +// Station Engineering jobs +#define JOB_ATMOSPHERIC_TECHNICIAN "Atmospheric Technician" +#define JOB_ENGINEER "Engineer" + @@ -23,6 +25,10 @@ #define JOB_ALT_FORENSIC_TECHNICIAN "Forensic Technician" #define JOB_ALT_JUNIOR_OFFICER "Junior Officer" + +//Assistant/Visitor/Whatever +#define USELESS_JOB "Visitor" + /* "Emergency Response Team" "Syndicate" @@ -39,4 +45,18 @@ 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) + + alt_titles = list("Atmospheric Engineer" = /datum/alt_title/atmos_engi, "Atmospheric Maintainer" = /datum/alt_title/atmos_maint, "Disposals Technician" = /datum/alt_title/disposals_tech, + "Fuel Technician" = /datum/alt_title/refuel_tech) + alt_titles = list("Head Engineer" = /datum/alt_title/head_engineer, "Foreman" = /datum/alt_title/foreman, "Maintenance Manager" = /datum/alt_title/maintenance_manager) + + + + alt_titles = list("Apprentice Engineer" = /datum/alt_title/intern_eng, + "Medical Intern" = /datum/alt_title/intern_med, + "Research Intern" = /datum/alt_title/intern_sci, + "Security Cadet" = /datum/alt_title/intern_sec, + "Jr. Cargo Tech" = /datum/alt_title/intern_crg, + "Server" = /datum/alt_title/server, + "Assistant" = /datum/alt_title/assistant) */ diff --git a/code/__defines/misc_vr.dm b/code/__defines/misc_vr.dm index 114448b916..1efab42616 100644 --- a/code/__defines/misc_vr.dm +++ b/code/__defines/misc_vr.dm @@ -42,9 +42,6 @@ #define BLUE_SHIELDED 2 // Shield from bluespace teleportation (telescience) -//Assistant/Visitor/Whatever -#define USELESS_JOB "Visitor" - //Herm Gender #define HERM "herm" diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index 7515e47dac..5a7edb6a33 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -350,7 +350,7 @@ Recharging stations are available in robotics, the dormitory bathrooms, and the /obj/screen/alert/locked name = "Locked Down" - desc = "Unit has been remotely locked down. Usage of a Robotics Control Console like the one in the Research Director's \ + desc = "Unit has been remotely locked down. Usage of a Robotics Control Console like the one in the " + JOB_RESEARCH_DIRECTOR + "'s \ office by your AI master or any qualified human may resolve this matter. Robotics may provide further assistance if necessary." icon_state = "locked" no_underlay = TRUE diff --git a/code/datums/outfits/jobs/engineering.dm b/code/datums/outfits/jobs/engineering.dm index 86bf9fa8cf..fdee06e0b2 100644 --- a/code/datums/outfits/jobs/engineering.dm +++ b/code/datums/outfits/jobs/engineering.dm @@ -11,7 +11,7 @@ flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL /decl/hierarchy/outfit/job/engineering/chief_engineer - name = OUTFIT_JOB_NAME("Chief engineer") + name = OUTFIT_JOB_NAME(JOB_CHIEF_ENGINEER) head = /obj/item/clothing/head/hardhat/white uniform = /obj/item/clothing/under/rank/chief_engineer l_ear = /obj/item/device/radio/headset/heads/ce @@ -20,14 +20,14 @@ pda_type = /obj/item/device/pda/heads/ce /decl/hierarchy/outfit/job/engineering/engineer - name = OUTFIT_JOB_NAME("Engineer") + name = OUTFIT_JOB_NAME(JOB_ENGINEER) head = /obj/item/clothing/head/hardhat uniform = /obj/item/clothing/under/rank/engineer id_type = /obj/item/weapon/card/id/engineering pda_type = /obj/item/device/pda/engineering /decl/hierarchy/outfit/job/engineering/atmos - name = OUTFIT_JOB_NAME("Atmospheric technician") + name = OUTFIT_JOB_NAME(JOB_ATMOSPHERIC_TECHNICIAN) uniform = /obj/item/clothing/under/rank/atmospheric_technician belt = /obj/item/weapon/storage/belt/utility/atmostech id_type = /obj/item/weapon/card/id/engineering/atmos diff --git a/code/game/antagonist/station/revolutionary.dm b/code/game/antagonist/station/revolutionary.dm index d8b2f8994e..51c0b246d0 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(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") + protected_jobs = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, "Internal Affairs Agent", JOB_SITE_MANAGER, JOB_HEAD_OF_PERSONNEL, JOB_HEAD_OF_SECURITY, JOB_CHIEF_ENGINEER, JOB_RESEARCH_DIRECTOR, "Chief Medical Officer") + roundstart_restricted = list("Internal Affairs Agent", JOB_SITE_MANAGER, JOB_HEAD_OF_PERSONNEL, JOB_HEAD_OF_SECURITY, JOB_CHIEF_ENGINEER, JOB_RESEARCH_DIRECTOR, "Chief Medical Officer") /datum/antagonist/revolutionary/New() ..() diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 3af944967e..17c64661eb 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -638,7 +638,7 @@ var/global/list/all_objectives = list() return /datum/objective/heist/kidnap/choose_target() - var/list/roles = list("Chief Engineer","Research Director","Roboticist","Chemist","Engineer") + var/list/roles = list(JOB_CHIEF_ENGINEER,JOB_RESEARCH_DIRECTOR,"Roboticist","Chemist",JOB_ENGINEER) var/list/possible_targets = list() var/list/priority_targets = list() diff --git a/code/game/jobs/access_datum.dm b/code/game/jobs/access_datum.dm index 810c669754..1056d8e455 100644 --- a/code/game/jobs/access_datum.dm +++ b/code/game/jobs/access_datum.dm @@ -127,7 +127,7 @@ /var/const/access_captain = 20 /datum/access/captain id = access_captain - desc = "Site Manager" + desc = JOB_SITE_MANAGER region = ACCESS_REGION_COMMAND /var/const/access_all_personal_lockers = 21 @@ -187,7 +187,7 @@ /var/const/access_rd = 30 /datum/access/rd id = access_rd - desc = "Research Director" + desc = JOB_RESEARCH_DIRECTOR region = ACCESS_REGION_RESEARCH /var/const/access_cargo = 31 @@ -331,13 +331,13 @@ var/const/access_explorer = 43 /var/const/access_ce = 56 /datum/access/ce id = access_ce - desc = "Chief Engineer" + desc = JOB_CHIEF_ENGINEER region = ACCESS_REGION_ENGINEERING /var/const/access_hop = 57 /datum/access/hop id = access_hop - desc = "Head of Personnel" + desc = JOB_HEAD_OF_PERSONNEL region = ACCESS_REGION_COMMAND /var/const/access_hos = 58 diff --git a/code/game/jobs/job/assistant.dm b/code/game/jobs/job/assistant.dm index 0cf6a8c086..9551ffd59a 100644 --- a/code/game/jobs/job/assistant.dm +++ b/code/game/jobs/job/assistant.dm @@ -33,7 +33,7 @@ /datum/alt_title/tech_assist title = "Technical Assistant" title_blurb = "A Technical Assistant attempts to provide whatever the Engineering department needs. They are not proper Engineers, and are \ - often in training to become an Engineer. A Technical Assistant has no real authority." + often in training to become an " + JOB_ENGINEER + ". A Technical Assistant has no real authority." /datum/alt_title/med_intern title = "Medical Intern" diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index e5ae6973a3..998287ccbc 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -2,7 +2,7 @@ // Chief Engineer ////////////////////////////////// /datum/job/chief_engineer - title = "Chief Engineer" + title = JOB_CHIEF_ENGINEER flag = CHIEF departments_managed = list(DEPARTMENT_ENGINEERING) departments = list(DEPARTMENT_ENGINEERING, DEPARTMENT_COMMAND) @@ -34,7 +34,7 @@ minimal_player_age = 7 outfit_type = /decl/hierarchy/outfit/job/engineering/chief_engineer - job_description = "The Chief Engineer manages the Engineering Department, ensuring that the Engineers work on what needs to be done, handling distribution \ + job_description = "The " + JOB_CHIEF_ENGINEER + " manages the Engineering Department, ensuring that the Engineers work on what needs to be done, handling distribution \ of manpower as much as they handle hands-on operations and repairs. They are also expected to keep the rest of the station informed of \ any structural threats to the station that may be hazardous to health or disruptive to work." @@ -42,14 +42,14 @@ // Engineer ////////////////////////////////// /datum/job/engineer - title = "Engineer" + title = JOB_ENGINEER flag = ENGINEER departments = list(DEPARTMENT_ENGINEERING) department_flag = ENGSEC faction = "Station" total_positions = 5 spawn_positions = 5 - supervisors = "the Chief Engineer" + supervisors = "the "+ JOB_CHIEF_ENGINEER selection_color = "#5B4D20" economic_modifier = 5 access = list(access_eva, access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction, access_atmospherics) @@ -61,7 +61,7 @@ min_age_by_species = list(SPECIES_PROMETHEAN = 2) outfit_type = /decl/hierarchy/outfit/job/engineering/engineer - job_description = "An Engineer keeps the station running. They repair damages, keep the atmosphere stable, and ensure that power is being \ + job_description = "An " + JOB_ENGINEER + " keeps the station running. They repair damages, keep the atmosphere stable, and ensure that power is being \ generated and distributed. On quiet shifts, they may be called upon to make cosmetic alterations to the station." // Engineer Alt Titles @@ -84,14 +84,14 @@ // Atmos Tech ////////////////////////////////// /datum/job/atmos - title = "Atmospheric Technician" + title = JOB_ATMOSPHERIC_TECHNICIAN flag = ATMOSTECH departments = list(DEPARTMENT_ENGINEERING) department_flag = ENGSEC faction = "Station" total_positions = 3 spawn_positions = 2 - supervisors = "the Chief Engineer" + supervisors = "the " + JOB_CHIEF_ENGINEER selection_color = "#5B4D20" economic_modifier = 5 access = list(access_eva, access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction, access_atmospherics, access_external_airlocks) @@ -101,5 +101,5 @@ min_age_by_species = list(SPECIES_PROMETHEAN = 2) outfit_type = /decl/hierarchy/outfit/job/engineering/atmos - job_description = "An Atmospheric Technician is primarily concerned with keeping the station's atmosphere breathable. They are expected to have a good \ + job_description = "An " + JOB_ATMOSPHERIC_TECHNICIAN + " is primarily concerned with keeping the station's atmosphere breathable. They are expected to have a good \ understanding of the pipes, vents, and scrubbers that move gasses around the station, and to be familiar with proper firefighting procedure." diff --git a/code/game/jobs/job/engineering_vr.dm b/code/game/jobs/job/engineering_vr.dm index 34c93be572..3cc1989377 100644 --- a/code/game/jobs/job/engineering_vr.dm +++ b/code/game/jobs/job/engineering_vr.dm @@ -61,7 +61,7 @@ /datum/alt_title/disposals_tech title = "Disposals Technician" - title_blurb = "A Disposals Technician is an Atmospheric Technician still and can fulfill all the same duties, although specializes more in disposals delivery system's operations and configurations." + title_blurb = "A Disposals Technician is an " + JOB_ATMOSPHERIC_TECHNICIAN + " still and can fulfill all the same duties, although specializes more in disposals delivery system's operations and configurations." /datum/alt_title/refuel_tech title = "Fuel Technician" diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index 0d65209732..d011b7b6d1 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -132,7 +132,7 @@ faction = "Station" total_positions = 0 spawn_positions = 0 - supervisors = "the Chief Medical Officer and Research Director" + supervisors = "the Chief Medical Officer and " + JOB_RESEARCH_DIRECTOR selection_color = "#013D3B" economic_modifier = 7 access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics, access_research) diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index a75d5770d1..a0457d77e1 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -2,7 +2,7 @@ // Research Director ////////////////////////////////// /datum/job/rd - title = "Research Director" + title = JOB_RESEARCH_DIRECTOR flag = RD departments_managed = list(DEPARTMENT_RESEARCH) departments = list(DEPARTMENT_RESEARCH, DEPARTMENT_COMMAND) @@ -32,14 +32,14 @@ banned_job_species = list(SPECIES_TESHARI, SPECIES_DIONA, SPECIES_PROMETHEAN, SPECIES_ZADDAT, "digital") outfit_type = /decl/hierarchy/outfit/job/science/rd - job_description = "The Research Director manages and maintains the Research department. They are required to ensure the safety of the entire crew, \ + job_description = "The " + JOB_RESEARCH_DIRECTOR + " manages and maintains the Research department. They are required to ensure the safety of the entire crew, \ at least with regards to anything occurring in the Research department, and to inform the crew of any disruptions that \ - might originate from Research. The Research Director often has at least passing knowledge of most of the Research department, but \ + might originate from Research. The " + JOB_RESEARCH_DIRECTOR + " often has at least passing knowledge of most of the Research department, but \ are encouraged to allow their staff to perform their own duties." alt_titles = list("Research Supervisor" = /datum/alt_title/research_supervisor) -// Research Director Alt Titles +// " + JOB_RESEARCH_DIRECTOR + " Alt Titles /datum/alt_title/research_supervisor title = "Research Supervisor" @@ -54,7 +54,7 @@ faction = "Station" total_positions = 5 spawn_positions = 3 - supervisors = "the Research Director" + supervisors = "the " + JOB_RESEARCH_DIRECTOR selection_color = "#633D63" economic_modifier = 7 access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology, access_xenoarch) @@ -99,7 +99,7 @@ faction = "Station" total_positions = 3 spawn_positions = 2 - supervisors = "the Research Director" + supervisors = "the " + JOB_RESEARCH_DIRECTOR selection_color = "#633D63" economic_modifier = 7 access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology, access_hydroponics) @@ -133,7 +133,7 @@ VR edit end*/ faction = "Station" total_positions = 2 spawn_positions = 2 - supervisors = "the Research Director" + supervisors = "the " + JOB_RESEARCH_DIRECTOR selection_color = "#633D63" economic_modifier = 5 access = list(access_robotics, access_tox, access_tox_storage, access_tech_storage, access_morgue, access_research) //As a job that handles so many corpses, it makes sense for them to have morgue access. diff --git a/code/game/jobs/job/science_vr.dm b/code/game/jobs/job/science_vr.dm index 23ba19d419..9c68b6b719 100644 --- a/code/game/jobs/job/science_vr.dm +++ b/code/game/jobs/job/science_vr.dm @@ -105,7 +105,7 @@ faction = "Station" total_positions = 2 spawn_positions = 2 - supervisors = "the Research Director" + supervisors = "the " + JOB_RESEARCH_DIRECTOR selection_color = "#633D63" economic_modifier = 7 access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobotany, access_hydroponics) diff --git a/code/game/machinery/requests_console_vr.dm b/code/game/machinery/requests_console_vr.dm index b001f21891..f20da2a78f 100644 --- a/code/game/machinery/requests_console_vr.dm +++ b/code/game/machinery/requests_console_vr.dm @@ -57,8 +57,8 @@ // Heads /obj/machinery/requests_console/preset/ce - name = "Chief Engineer RC" - department = "Chief Engineer's Desk" + name = JOB_CHIEF_ENGINEER + " RC" + department = JOB_CHIEF_ENGINEER + "'s Desk" departmentType = RC_ASSIST|RC_INFO announcementConsole = 1 @@ -75,8 +75,8 @@ announcementConsole = 1 /obj/machinery/requests_console/preset/rd - name = "Research Director RC" - department = "Research Director's Desk" + name = JOB_RESEARCH_DIRECTOR + " RC" + department = JOB_RESEARCH_DIRECTOR +"'s Desk" departmentType = RC_ASSIST|RC_INFO announcementConsole = 1 diff --git a/code/game/objects/effects/job_start_landmarks.dm b/code/game/objects/effects/job_start_landmarks.dm index df670774db..9794dd637b 100644 --- a/code/game/objects/effects/job_start_landmarks.dm +++ b/code/game/objects/effects/job_start_landmarks.dm @@ -13,11 +13,11 @@ /obj/effect/landmark/start/security name = JOB_SECURITY_OFFICER /obj/effect/landmark/start/ce - name = "Chief Engineer" + name = JOB_CHIEF_ENGINEER /obj/effect/landmark/start/atmostech - name = "Atmospheric Technician" + name = JOB_ATMOSPHERIC_TECHNICIAN /obj/effect/landmark/start/engineer - name = "Engineer" + name = JOB_ENGINEER /obj/effect/landmark/start/cmo name = "Chief Medical Officer" /obj/effect/landmark/start/chemist @@ -29,7 +29,7 @@ /obj/effect/landmark/start/psych name = "Psychiatrist" /obj/effect/landmark/start/rd - name = "Research Director" + name = JOB_RESEARCH_DIRECTOR /obj/effect/landmark/start/roboticist name = "Roboticist" /obj/effect/landmark/start/scientist diff --git a/code/game/objects/items/toys/toys.dm b/code/game/objects/items/toys/toys.dm index 06f657909a..2610c67eef 100644 --- a/code/game/objects/items/toys/toys.dm +++ b/code/game/objects/items/toys/toys.dm @@ -323,8 +323,8 @@ toysay = "Grey tide station wide!" /obj/item/toy/figure/atmos - name = "Atmospheric Technician action figure" - desc = "A \"Space Life\" brand Atmospheric Technician action figure." + name = JOB_ATMOSPHERIC_TECHNICIAN + " action figure" + desc = "A \"Space Life\" brand " + JOB_ATMOSPHERIC_TECHNICIAN + " action figure." icon_state = "atmos" toysay = "Glory to Atmosia!" @@ -359,8 +359,8 @@ toysay = "For Cargonia!" /obj/item/toy/figure/ce - name = "Chief Engineer action figure" - desc = "A \"Space Life\" brand Chief Engineer action figure." + name = JOB_CHIEF_ENGINEER + " action figure" + desc = "A \"Space Life\" brand " + JOB_CHIEF_ENGINEER + " action figure." icon_state = "ce" toysay = "Wire the solars!" @@ -407,8 +407,8 @@ toysay = "Eliminate all threats!" /obj/item/toy/figure/engineer - name = "Engineer action figure" - desc = "A \"Space Life\" brand Engineer action figure." + name = JOB_ENGINEER + " action figure" + desc = "A \"Space Life\" brand " + JOB_ENGINEER + " action figure." icon_state = "engineer" toysay = "Oh god, the engine is gonna go!" @@ -485,8 +485,8 @@ toysay = "Ei Nath!" /obj/item/toy/figure/rd - name = "Research Director action figure" - desc = "A \"Space Life\" brand Research Director action figure." + name = JOB_RESEARCH_DIRECTOR + " action figure" + desc = "A \"Space Life\" brand " + JOB_RESEARCH_DIRECTOR + " action figure." icon_state = "rd" toysay = "Blowing all of the borgs!" 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 9dab9e9c92..a022aba2f0 100644 --- a/code/game/objects/items/weapons/id cards/id_stacks.dm +++ b/code/game/objects/items/weapons/id cards/id_stacks.dm @@ -137,14 +137,17 @@ /obj/item/weapon/card/id/engineering name = "Engineering ID" initial_sprite_stack = list("base-stamp", "top-orange", "stamp-n") + rank = JOB_ENGINEER /obj/item/weapon/card/id/engineering/atmos name = "Atmospherics ID" initial_sprite_stack = list("base-stamp", "top-orange", "stripe-medblu", "stamp-n") + rank = JOB_ATMOSPHERIC_TECHNICIAN /obj/item/weapon/card/id/engineering/head - name = "Chief Engineer's ID" + name = JOB_CHIEF_ENGINEER + "'s ID" initial_sprite_stack = list("base-stamp-silver", "top-orange", "stamp-n", "pips-gold") + rank = JOB_CHIEF_ENGINEER //Science @@ -165,8 +168,9 @@ initial_sprite_stack = list("base-stamp", "top-purple", "stamp-n", "stripe-green") /obj/item/weapon/card/id/science/head - name = "Research Director's ID" + name = JOB_RESEARCH_DIRECTOR + "'s ID" initial_sprite_stack = list("base-stamp-silver", "top-purple", "stamp-n", "pips-gold") + rank = JOB_RESEARCH_DIRECTOR //Cargo 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 c07cf1e298..5f29c26cb0 100644 --- a/code/game/objects/items/weapons/id cards/station_ids.dm +++ b/code/game/objects/items/weapons/id cards/station_ids.dm @@ -255,16 +255,16 @@ secondary_color = rgb(223,159,95) /obj/item/weapon/card/id/engineering/atmos - assignment = "Atmospheric Technician" - rank = "Atmospheric Technician" + assignment = JOB_ATMOSPHERIC_TECHNICIAN + rank = JOB_ATMOSPHERIC_TECHNICIAN /obj/item/weapon/card/id/engineering/head name = "identification card" desc = "A card which represents creativity and ingenuity." primary_color = rgb(189,94,0) secondary_color = rgb(255,223,127) - assignment = "Chief Engineer" - rank = "Chief Engineer" + assignment = JOB_CHIEF_ENGINEER + rank = JOB_CHIEF_ENGINEER /obj/item/weapon/card/id/science name = "identification card" @@ -278,8 +278,8 @@ desc = "A card which represents knowledge and reasoning." primary_color = rgb(142,47,142) secondary_color = rgb(255,223,127) - assignment = "Research Director" - rank = "Research Director" + assignment = JOB_RESEARCH_DIRECTOR + rank = JOB_RESEARCH_DIRECTOR /obj/item/weapon/card/id/cargo name = "identification card" @@ -435,10 +435,10 @@ icon_state = "itg_white" /obj/item/weapon/card/id/event/accessset/itg/crew/engineer - name = "\improper ITG Engineer's ID" - desc = "An ID card belonging to the Engineer of an ITG vessel. The Engineer's responsibility is primarily to maintain the ship. They may also be tasked to assist with cargo movement duties." - assignment = "Engineer" - rank = "Engineer" + name = "\improper ITG " + JOB_ENGINEER + "'s ID" + desc = "An ID card belonging to the " + JOB_ENGINEER + " of an ITG vessel. The " + JOB_ENGINEER + "'s responsibility is primarily to maintain the ship. They may also be tasked to assist with cargo movement duties." + assignment = JOB_ENGINEER + rank = JOB_ENGINEER icon_state = "itg_orange" /obj/item/weapon/card/id/event/accessset/itg/crew/passengerliason @@ -553,8 +553,8 @@ "Psychiatrist" = "itg_white", "Field Medic" = "itg_white", "Talon Doctor" = "itg_white", - "Atmospheric Technician" = "itg_orange", - "Engineer" = "itg_orange", + JOB_ATMOSPHERIC_TECHNICIAN = "itg_orange", + JOB_ENGINEER = "itg_orange", "Off-duty Officer" = "itg_red", "Off-duty Engineer" = "itg_orange", "Off-duty Medic" = "itg_white", @@ -578,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(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 + var/list/itgdont = list(JOB_SITE_MANAGER, JOB_HEAD_OF_PERSONNEL, JOB_COMMAND_SECRETARY, "Head of Security", JOB_CHIEF_ENGINEER, "Chief Medical Officer", JOB_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/modules/admin/newbanjob.dm b/code/modules/admin/newbanjob.dm index 2677aaad8f..3c2008d5db 100644 --- a/code/modules/admin/newbanjob.dm +++ b/code/modules/admin/newbanjob.dm @@ -1,3 +1,20 @@ +// Station ranks +#define RANK_HEADS "Heads" +#define RANK_SECURITY "Security" +#define RANK_ENGINEERING "Engineering" +#define RANK_RESEARCH "Research" +#define RANK_MEDICAL "Medical" +#define RANK_CE_STATION_ENGINEER "CE_Station_Engineer" +#define RANK_CE_ATMOSPHERIC_TECH "CE_Atmospheric_Tech" +#define RANK_CE_SHAFT_MINER "CE_Shaft_Miner" +#define RANK_CHEMIST_RD_CMO "Chemist_RD_CMO" +#define RANK_GENETIST_RD_CMO "Geneticist_RD_CMO" +#define RANK_MD_CMO "MD_CMO" +#define RANK_SCIENTIST_RD "Scientist_RD" +#define RANK_AI_CYBORG "AI_Cyborg" +#define RANK_DETECTIVE_HOS "Detective_HoS" +#define RANK_VIROLOGIST_RD_CMO "Virologist_RD_CMO" + var/savefile/Banlistjob @@ -65,8 +82,8 @@ var/savefile/Banlistjob 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, JOB_CHIEF_ENGINEER) + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_RESEARCH_DIRECTOR) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chief Medical Officer") return 1 if(rank == RANK_SECURITY) @@ -77,65 +94,65 @@ var/savefile/Banlistjob AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Cyborg") return 1 if(rank == RANK_ENGINEERING) - AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Engineer") - AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Atmospheric Technician") - AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chief Engineer") + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_ENGINEER) + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_ATMOSPHERIC_TECHNICIAN) + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_CHIEF_ENGINEER) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Cyborg") return 1 - if(rank == "Research") + if(rank == RANK_RESEARCH) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Scientist") AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Geneticist") AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chief Medical Officer") - AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Research Director") + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_RESEARCH_DIRECTOR) return 1 - if(rank == "Medical") + if(rank == RANK_MEDICAL) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Geneticist") AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Medical Doctor") AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chief Medical Officer") AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chemist") AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Cyborg") return 1 - if(rank == "CE_Station_Engineer") - AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Engineer") - AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chief Engineer") + if(rank == RANK_CE_STATION_ENGINEER) + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_ENGINEER) + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_CHIEF_ENGINEER) return 1 - if(rank == "CE_Atmospheric_Tech") - AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Atmospheric Technician") - AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chief Engineer") + if(rank == RANK_CE_ATMOSPHERIC_TECH) + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_ATMOSPHERIC_TECHNICIAN) + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_CHIEF_ENGINEER) return 1 - if(rank == "CE_Shaft_Miner") + if(rank == RANK_CE_SHAFT_MINER) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_SHAFT_MINER) - AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chief Engineer") + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_CHIEF_ENGINEER) return 1 - if(rank == "Chemist_RD_CMO") + if(rank == RANK_CHEMIST_RD_CMO) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chief Medical Officer") - AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Research Director") + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_RESEARCH_DIRECTOR) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chemist") return 1 - if(rank == "Geneticist_RD_CMO") + if(rank == RANK_GENETIST_RD_CMO) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chief Medical Officer") - AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Research Director") + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_RESEARCH_DIRECTOR) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Geneticist") return 1 - if(rank == "MD_CMO") + if(rank == RANK_MD_CMO) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chief Medical Officer") AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Medical Doctor") return 1 - if(rank == "Scientist_RD") - AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Research Director") + if(rank == RANK_SCIENTIST_RD) + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_RESEARCH_DIRECTOR) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Scientist") return 1 - if(rank == "AI_Cyborg") + if(rank == RANK_AI_CYBORG) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Cyborg") AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "AI") return 1 - if(rank == "Detective_HoS") + if(rank == RANK_DETECTIVE_HOS) 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") + if(rank == RANK_VIROLOGIST_RD_CMO) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chief Medical Officer") - AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Research Director") + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_RESEARCH_DIRECTOR) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Virologist") return 1 @@ -272,3 +289,19 @@ var/savefile/Banlistjob Banlistjob.cd = "/base" for (var/A in Banlistjob.dir) RemoveBanjob(A, "full") + +#undef RANK_HEADS +#undef RANK_SECURITY +#undef RANK_ENGINEERING +#undef RANK_RESEARCH +#undef RANK_MEDICAL +#undef RANK_CE_STATION_ENGINEER +#undef RANK_CE_ATMOSPHERIC_TECH +#undef RANK_CE_SHAFT_MINER +#undef RANK_CHEMIST_RD_CMO +#undef RANK_GENETIST_RD_CMO +#undef RANK_MD_CMO +#undef RANK_SCIENTIST_RD +#undef RANK_AI_CYBORG +#undef RANK_DETECTIVE_HOS +#undef RANK_VIROLOGIST_RD_CMO diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index 909b2fa200..bf0c015172 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -162,7 +162,7 @@ corpseidaccess = "Medical Doctor" /obj/effect/landmark/corpse/engineer - name = "Engineer" + name = JOB_ENGINEER corpseradio = /obj/item/device/radio/headset/headset_eng corpseuniform = /obj/item/clothing/under/rank/engineer corpseback = /obj/item/weapon/storage/backpack/industrial @@ -171,8 +171,8 @@ corpsegloves = /obj/item/clothing/gloves/yellow corpsehelmet = /obj/item/clothing/head/hardhat corpseid = 1 - corpseidjob = "Engineer" - corpseidaccess = "Engineer" + corpseidjob = JOB_ENGINEER + corpseidaccess = JOB_ENGINEER /obj/effect/landmark/corpse/engineer/rig corpsesuit = /obj/item/clothing/suit/space/void/engineering @@ -266,12 +266,12 @@ corpseidjob = "Crewmate" /obj/effect/landmark/corpse/vintage/engineering - name = "Unknown Engineer" + name = "Unknown " + JOB_ENGINEER corpsesuit = /obj/item/clothing/suit/space/void/refurb/engineering corpsehelmet = /obj/item/clothing/head/helmet/space/void/refurb/engineering corpsebelt = /obj/item/weapon/storage/belt/utility/full corpseback = /obj/item/weapon/tank/oxygen/yellow - corpseidjob = "Engineer" + corpseidjob = JOB_ENGINEER /obj/effect/landmark/corpse/vintage/marine name = "Unknown Marine" diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes.dm b/code/modules/client/preference_setup/loadout/loadout_eyes.dm index 5954f9587f..2fb4e30d5a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_eyes.dm +++ b/code/modules/client/preference_setup/loadout/loadout_eyes.dm @@ -117,7 +117,7 @@ display_name = "Optical Meson Scanners selection" description = "Select from a range of meson-projection eyewear. Note: not all of these items are atmospherically sealed." path = /obj/item/clothing/glasses/meson - allowed_roles = list("Engineer","Chief Engineer","Atmospheric Technician", "Scientist", "Research Director") + allowed_roles = list(JOB_ENGINEER,JOB_CHIEF_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN, "Scientist", JOB_RESEARCH_DIRECTOR) /datum/gear/eyes/meson/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 65351d357e..283fdf503b 100644 --- a/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm @@ -24,12 +24,12 @@ /datum/gear/eyes/arglasses/sci display_name = "AR-Research glasses" path = /obj/item/clothing/glasses/omnihud/rnd - allowed_roles = list("Research Director","Scientist","Xenobiologist","Xenobotanist","Roboticist") + allowed_roles = list(JOB_RESEARCH_DIRECTOR,"Scientist","Xenobiologist","Xenobotanist","Roboticist") /datum/gear/eyes/arglasses/eng display_name = "AR-Engineering glasses" path = /obj/item/clothing/glasses/omnihud/eng - allowed_roles = list("Engineer","Chief Engineer","Atmospheric Technician") + allowed_roles = list(JOB_ENGINEER,JOB_CHIEF_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN) /datum/gear/eyes/arglasses/med display_name = "AR-Medical glasses" diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm index 943b16b8e8..f8b37804f9 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm @@ -17,7 +17,7 @@ display_name = "Airhorn - Example Item" description = "An example item that you probably shouldn't see!" ckeywhitelist = list("your_ckey_here") - allowed_roles = list("Engineer") + allowed_roles = list(JOB_ENGINEER) */ /datum/gear/fluff/collar //Use this as a base path for collars if you'd like to set tags in loadout. Make sure you don't use apostrophes in the display name or this breaks! @@ -792,7 +792,7 @@ description = "A Hull Systems Omni-Tool capable of temporarily shrinking to handheld sizes for even the most delicate work." ckeywhitelist = list("lewzharri") character_name = list ("Kovgam Zharri") - allowed_roles = list("Roboticist","Engineer","Scientist","Xenobiologist","Xenobotanist","Research Director") + allowed_roles = list("Roboticist",JOB_ENGINEER,"Scientist","Xenobiologist","Xenobotanist",JOB_RESEARCH_DIRECTOR) // M CKEYS /datum/gear/fluff/phi_box @@ -1076,14 +1076,14 @@ display_name = "Kateryna's Voidsuit" ckeywhitelist = list("samanthafyre") character_name = list("Kateryna Petrovitch") - allowed_roles = list("Engineer", "Chief Engineer", "Atmospheric Technician") + allowed_roles = list(JOB_ENGINEER, JOB_CHIEF_ENGINEER, JOB_ATMOSPHERIC_TECHNICIAN) /datum/gear/fluff/katerina_spacesuit path = /obj/item/clothing/head/helmet/space/fluff/kate display_name = "Kateryna's Helmet" ckeywhitelist = list("samanthafyre") character_name = list("Kateryna Petrovitch") - allowed_roles = list("Engineer", "Chief Engineer", "Atmospheric Technician") + allowed_roles = list(JOB_ENGINEER, JOB_CHIEF_ENGINEER, JOB_ATMOSPHERIC_TECHNICIAN) /datum/gear/fluff/kateryna_armorvest path = /obj/item/clothing/suit/armor/vest/wolftaur/kate diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index 29648cdb85..2a2f24b8ac 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -288,7 +288,7 @@ description = "Select from a range of welding masks (engineering crew/roboticists only)" path = /obj/item/clothing/head/welding cost = 2 - allowed_roles = list("Chief Engineer","Engineer","Atmospheric Technician","Research Director","Roboticist") + allowed_roles = list(JOB_CHIEF_ENGINEER,JOB_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN,JOB_RESEARCH_DIRECTOR,"Roboticist") /datum/gear/head/welding/New() ..() diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index c45e21d815..5fe9dba4f3 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -164,7 +164,7 @@ /datum/gear/suit/labcoat_rd display_name = "labcoat, research director" path = /obj/item/clothing/suit/storage/toggle/labcoat/rd - allowed_roles = list("Research Director") + allowed_roles = list(JOB_RESEARCH_DIRECTOR) show_roles = FALSE /datum/gear/suit/miscellaneous/labcoat @@ -270,14 +270,14 @@ /datum/gear/suit/roles/cloak_ce display_name = "cloak, chief engineer" path = /obj/item/clothing/accessory/poncho/roles/cloak/ce - allowed_roles = list("Chief Engineer") + allowed_roles = list(JOB_CHIEF_ENGINEER) show_roles = FALSE cost = 1 /datum/gear/suit/roles/cloak_rd display_name = "cloak, research director" path = /obj/item/clothing/accessory/poncho/roles/cloak/rd - allowed_roles = list("Research Director") + allowed_roles = list(JOB_RESEARCH_DIRECTOR) show_roles = FALSE cost = 1 @@ -463,37 +463,37 @@ /datum/gear/suit/wintercoat/science display_name = "winter coat, science" path = /obj/item/clothing/suit/storage/hooded/wintercoat/science - allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist") + allowed_roles = list(JOB_RESEARCH_DIRECTOR,"Scientist", "Roboticist", "Xenobiologist", "Xenobotanist") show_roles = FALSE /datum/gear/suit/wintercoat/science/robotics display_name = "winter coat, robotics" path = /obj/item/clothing/suit/storage/hooded/wintercoat/science/robotics - allowed_roles = list("Research Director", "Roboticist") + allowed_roles = list(JOB_RESEARCH_DIRECTOR, "Roboticist") show_roles = FALSE /datum/gear/suit/wintercoat/science/rd display_name = "winter coat, research director" path = /obj/item/clothing/suit/storage/hooded/wintercoat/science/rd - allowed_roles = list("Research Director") + allowed_roles = list(JOB_RESEARCH_DIRECTOR) show_roles = FALSE /datum/gear/suit/wintercoat/engineering display_name = "winter coat, engineering" path = /obj/item/clothing/suit/storage/hooded/wintercoat/engineering - allowed_roles = list("Chief Engineer","Atmospheric Technician", "Engineer") + allowed_roles = list(JOB_CHIEF_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN, JOB_ENGINEER) show_roles = FALSE /datum/gear/suit/wintercoat/engineering/atmos display_name = "winter coat, atmospherics" path = /obj/item/clothing/suit/storage/hooded/wintercoat/engineering/atmos - allowed_roles = list("Chief Engineer", "Atmospheric Technician") + allowed_roles = list(JOB_CHIEF_ENGINEER, JOB_ATMOSPHERIC_TECHNICIAN) show_roles = FALSE /datum/gear/suit/wintercoat/engineering/ce display_name = "winter coat, chief engineer" path = /obj/item/clothing/suit/storage/hooded/wintercoat/engineering/ce - allowed_roles = list("Chief Engineer") + allowed_roles = list(JOB_CHIEF_ENGINEER) show_roles = FALSE /datum/gear/suit/wintercoat/hydro @@ -656,7 +656,7 @@ /datum/gear/suit/snowsuit/command display_name = "snowsuit, command" path = /obj/item/clothing/suit/storage/snowsuit/command - allowed_roles = list(JOB_SITE_MANAGER,"Research Director",JOB_HEAD_OF_PERSONNEL,JOB_HEAD_OF_SECURITY,"Chief Engineer",JOB_COMMAND_SECRETARY) + allowed_roles = list(JOB_SITE_MANAGER,JOB_RESEARCH_DIRECTOR,JOB_HEAD_OF_PERSONNEL,JOB_HEAD_OF_SECURITY,JOB_CHIEF_ENGINEER,JOB_COMMAND_SECRETARY) show_roles = FALSE /datum/gear/suit/snowsuit/security @@ -674,13 +674,13 @@ /datum/gear/suit/snowsuit/science display_name = "snowsuit, science" path = /obj/item/clothing/suit/storage/snowsuit/science - allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist") + allowed_roles = list(JOB_RESEARCH_DIRECTOR,"Scientist", "Roboticist", "Xenobiologist") show_roles = FALSE /datum/gear/suit/snowsuit/engineering display_name = "snowsuit, engineering" path = /obj/item/clothing/suit/storage/snowsuit/engineering - allowed_roles = list("Chief Engineer","Atmospheric Technician", "Engineer") + allowed_roles = list(JOB_CHIEF_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN, JOB_ENGINEER) show_roles = FALSE /datum/gear/suit/snowsuit/cargo 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 da24a68ded..88323be107 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uni_selector.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uni_selector.dm @@ -393,9 +393,9 @@ //Engineering /datum/gear/uniform/engineering_chief_selector - display_name = "Engineering - Chief Engineer's Uniforms" - description = "Select from a range of outfits available to all Chief Engineers." - allowed_roles = list("Chief Engineer") + display_name = "Engineering - " + JOB_CHIEF_ENGINEER + "'s Uniforms" + description = "Select from a range of outfits available to all " + JOB_CHIEF_ENGINEER + "s." + allowed_roles = list(JOB_CHIEF_ENGINEER) show_roles = FALSE path = /obj/item/clothing/under/rank/neo_chiefengi sort_category = "Uniforms" @@ -420,7 +420,7 @@ /datum/gear/uniform/engineer_selector display_name = "Engineering - Basic Uniforms" description = "Select from a range of outfits available to all Engineering personnel." - allowed_roles = list("Chief Engineer","Engineer","Atmospheric Technician","Talon Engineer") + allowed_roles = list(JOB_CHIEF_ENGINEER,JOB_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN,"Talon Engineer") show_roles = FALSE path = /obj/item/clothing/under/rank/neo_engi sort_category = "Uniforms" @@ -448,7 +448,7 @@ /datum/gear/uniform/engi_atmos_selector display_name = "Engineering - Atmos Tech's Uniforms" description = "Select from a range of outfits available to all Atmospherics Technicians." - allowed_roles = list("Chief Engineer","Atmospheric Technician") + allowed_roles = list(JOB_CHIEF_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN) show_roles = FALSE path = /obj/item/clothing/under/rank/atmospheric_technician/skirt sort_category = "Uniforms" @@ -571,9 +571,9 @@ //Science /datum/gear/uniform/research_director_selector - display_name = "Science - Research Director's Uniforms" - description = "Select from a range of outfits available to all Research Directors." - allowed_roles = list("Research Director") + display_name = "Science - " + JOB_RESEARCH_DIRECTOR + "'s Uniforms" + description = "Select from a range of outfits available to all " + JOB_RESEARCH_DIRECTOR + "s." + allowed_roles = list(JOB_RESEARCH_DIRECTOR) show_roles = FALSE path = /obj/item/clothing/under/rank/neo_rd_suit sort_category = "Uniforms" @@ -599,7 +599,7 @@ /datum/gear/uniform/science_dept_selector display_name = "Science - Basic Uniforms" description = "Select from a range of outfits available to all Science personnel." - allowed_roles = list("Scientist","Research Director","Roboticist","Xenobiologist","Xenobotanist") + allowed_roles = list("Scientist",JOB_RESEARCH_DIRECTOR,"Roboticist","Xenobiologist","Xenobotanist") show_roles = FALSE path = /obj/item/clothing/under/rank/neo_science sort_category = "Uniforms" @@ -624,7 +624,7 @@ /datum/gear/uniform/science_robotics_selector display_name = "Science - Roboticist's Uniforms" description = "Select from a range of outfits available to all Roboticists." - allowed_roles = list("Research Director","Roboticist") + allowed_roles = list(JOB_RESEARCH_DIRECTOR,"Roboticist") show_roles = FALSE path = /obj/item/clothing/under/rank/neo_robo sort_category = "Uniforms" diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm index 5f90c82ded..4bbd71c56d 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm @@ -20,21 +20,21 @@ /datum/gear/suit/job_fed/medsci display_name = "fed uniform, med/sci" path = /obj/item/clothing/suit/storage/fluff/fedcoat/fedblue - allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist","Xenobotanist") + allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist",JOB_RESEARCH_DIRECTOR,"Scientist", "Roboticist", "Xenobiologist","Xenobotanist") /datum/gear/suit/job_fed/eng display_name = "fed uniform, eng" path = /obj/item/clothing/suit/storage/fluff/fedcoat/fedeng - allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer") + allowed_roles = list(JOB_CHIEF_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN,JOB_ENGINEER) //DS9 /datum/gear/suit/job_trek/ds9_coat display_name = "DS9 Overcoat (use uniform)" path = /obj/item/clothing/suit/storage/trek/ds9 - allowed_roles = list(JOB_HEAD_OF_SECURITY,JOB_SITE_MANAGER,JOB_HEAD_OF_PERSONNEL,"Chief Engineer","Research Director", + allowed_roles = list(JOB_HEAD_OF_SECURITY,JOB_SITE_MANAGER,JOB_HEAD_OF_PERSONNEL,JOB_CHIEF_ENGINEER,JOB_RESEARCH_DIRECTOR, "Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist", - "Scientist","Roboticist","Xenobiologist","Xenobotanist","Atmospheric Technician", - "Engineer",JOB_WARDEN,JOB_DETECTIVE,JOB_SECURITY_OFFICER) + "Scientist","Roboticist","Xenobiologist","Xenobotanist",JOB_ATMOSPHERIC_TECHNICIAN, + JOB_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 1387851ea9..a120e8035a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm @@ -49,12 +49,12 @@ /datum/gear/utility/dufflebag/eng display_name = "engineering dufflebag" path = /obj/item/weapon/storage/backpack/dufflebag/eng - allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer") + allowed_roles = list(JOB_CHIEF_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN,JOB_ENGINEER) /datum/gear/utility/dufflebag/sci display_name = "science dufflebag" path = /obj/item/weapon/storage/backpack/dufflebag/sci - allowed_roles = list("Research Director","Scientist","Roboticist","Xenobiologist","Xenobotanist") + allowed_roles = list(JOB_RESEARCH_DIRECTOR,"Scientist","Roboticist","Xenobiologist","Xenobotanist") /datum/gear/utility/dufflebag/explorer display_name = "away team dufflebag" diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno.dm b/code/modules/client/preference_setup/loadout/loadout_xeno.dm index 998cc7f6e2..6e9ecdf8d1 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno.dm @@ -179,7 +179,7 @@ /datum/gear/uniform/dept/undercoat/rd display_name = "research director undercoat (Teshari)" path = /obj/item/clothing/under/teshari/undercoat/jobs/rd - allowed_roles = list("Research Director") + allowed_roles = list(JOB_RESEARCH_DIRECTOR) /datum/gear/uniform/dept/undercoat/hos display_name = "head of security undercoat (Teshari)" @@ -189,7 +189,7 @@ /datum/gear/uniform/dept/undercoat/ce display_name = "chief engineer undercoat (Teshari)" path = /obj/item/clothing/under/teshari/undercoat/jobs/ce - allowed_roles = list("Chief Engineer") + allowed_roles = list(JOB_CHIEF_ENGINEER) /datum/gear/uniform/dept/undercoat/cmo display_name = "chief medical officer undercoat (Teshari)" @@ -224,22 +224,22 @@ /datum/gear/uniform/dept/undercoat/engineer display_name = "engineering undercoat (Teshari)" path = /obj/item/clothing/under/teshari/undercoat/jobs/engineer - allowed_roles = list("Chief Engineer","Engineer") + allowed_roles = list(JOB_CHIEF_ENGINEER,JOB_ENGINEER) /datum/gear/uniform/dept/undercoat/atmos display_name = "atmospherics undercoat (Teshari)" path = /obj/item/clothing/under/teshari/undercoat/jobs/atmos - allowed_roles = list("Chief Engineer","Atmospheric Technician") + allowed_roles = list(JOB_CHIEF_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN) /datum/gear/uniform/dept/undercoat/research display_name = "scientist undercoat (Teshari)" path = /obj/item/clothing/under/teshari/undercoat/jobs/sci - allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist") + allowed_roles = list(JOB_RESEARCH_DIRECTOR,"Scientist", "Roboticist", "Xenobiologist") /datum/gear/uniform/dept/undercoat/robo display_name = "roboticist undercoat (Teshari)" path = /obj/item/clothing/under/teshari/undercoat/jobs/robo - allowed_roles = list("Research Director","Roboticist") + allowed_roles = list(JOB_RESEARCH_DIRECTOR,"Roboticist") /datum/gear/uniform/dept/undercoat/medical display_name = "medical undercoat (Teshari)" @@ -288,7 +288,7 @@ /datum/gear/suit/dept/cloak/rd display_name = "research director cloak (Teshari)" path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/rd - allowed_roles = list("Research Director") + allowed_roles = list(JOB_RESEARCH_DIRECTOR) /datum/gear/suit/dept/cloak/hos display_name = "head of security cloak (Teshari)" @@ -306,7 +306,7 @@ /datum/gear/suit/cloak/dept/ce display_name = "chief engineer cloak (Teshari)" path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/ce - allowed_roles = list("Chief Engineer") + allowed_roles = list(JOB_CHIEF_ENGINEER) /datum/gear/suit/dept/cloak/ce/New() ..() @@ -397,7 +397,7 @@ /datum/gear/suit/dept/cloak/engineer display_name = "engineering cloak (Teshari)" path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/engineer - allowed_roles = list("Chief Engineer","Engineer") + allowed_roles = list(JOB_CHIEF_ENGINEER,JOB_ENGINEER) /datum/gear/suit/dept/cloak/engineer/New() ..() @@ -410,7 +410,7 @@ /datum/gear/suit/dept/cloak/atmos display_name = "atmospherics cloak (Teshari)" path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/atmos - allowed_roles = list("Chief Engineer","Atmospheric Technician") + allowed_roles = list(JOB_CHIEF_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN) /datum/gear/suit/dept/cloak/atmos/New() ..() @@ -423,7 +423,7 @@ /datum/gear/suit/dept/cloak/research display_name = "scientist cloak (Teshari)" path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/sci - allowed_roles = list("Research Director","Scientist","Roboticist","Xenobiologist") + allowed_roles = list(JOB_RESEARCH_DIRECTOR,"Scientist","Roboticist","Xenobiologist") /datum/gear/suit/dept/cloak/research/New() ..() @@ -436,7 +436,7 @@ /datum/gear/suit/dept/cloak/robo display_name = "roboticist cloak (Teshari)" path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/robo - allowed_roles = list("Research Director","Roboticist") + allowed_roles = list(JOB_RESEARCH_DIRECTOR,"Roboticist") /datum/gear/suit/dept/cloak/robo/New() ..() @@ -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(JOB_SITE_MANAGER,JOB_HEAD_OF_PERSONNEL,JOB_HEAD_OF_SECURITY,"Chief Engineer","Chief Medical Officer","Research Director") + allowed_roles = list(JOB_SITE_MANAGER,JOB_HEAD_OF_PERSONNEL,JOB_HEAD_OF_SECURITY,JOB_CHIEF_ENGINEER,"Chief Medical Officer",JOB_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 3a5f8bbf24..20a440ab15 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm @@ -2,10 +2,10 @@ ///// /datum/gear/suit/dept/cloak/research - allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist") + allowed_roles = list(JOB_RESEARCH_DIRECTOR,"Scientist", "Roboticist", "Xenobiologist", "Xenobotanist") /datum/gear/uniform/dept/undercoat/research - allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist") + allowed_roles = list(JOB_RESEARCH_DIRECTOR,"Scientist", "Roboticist", "Xenobiologist", "Xenobotanist") ///// diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index 6d9fda604a..308672b3b7 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -76,7 +76,7 @@ /obj/item/clothing/head/hardhat/firefighter/chief name = "chief firefighter helmet" - desc = "A helmet with face mask specially designed for firefighting. This one is in the colors of the Chief Engineer. It's airtight and has a port for internals." + desc = "A helmet with face mask specially designed for firefighting. This one is in the colors of the " + JOB_CHIEF_ENGINEER + ". It's airtight and has a port for internals." icon_state = "helmet_firefighter_ce" max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE + 10000 @@ -166,4 +166,4 @@ /obj/item/clothing/head/hardhat/ranger/yellow hatcolor = "yellow" -*/ \ No newline at end of file +*/ diff --git a/code/modules/clothing/suits/aliens/teshari.dm b/code/modules/clothing/suits/aliens/teshari.dm index 2487e9a745..e9089950f7 100644 --- a/code/modules/clothing/suits/aliens/teshari.dm +++ b/code/modules/clothing/suits/aliens/teshari.dm @@ -131,7 +131,7 @@ /obj/item/clothing/suit/storage/teshari/cloak/jobs/ce name = "cheif engineer cloak" - desc = "A soft Teshari cloak made the Chief Engineer" + desc = "A soft Teshari cloak made for the "+ JOB_CHIEF_ENGINEER icon_state = "tesh_cloak_ce" /obj/item/clothing/suit/storage/teshari/cloak/jobs/engineer @@ -141,7 +141,7 @@ /obj/item/clothing/suit/storage/teshari/cloak/jobs/atmos name = "atmospherics cloak" - desc = "A soft Teshari cloak made for the Atmospheric Technician" + desc = "A soft Teshari cloak made for the " + JOB_ATMOSPHERIC_TECHNICIAN icon_state = "tesh_cloak_atmos" //Medical @@ -180,7 +180,7 @@ /obj/item/clothing/suit/storage/teshari/cloak/jobs/rd name = "research director cloak" - desc = "A soft Teshari cloak made for the Research Director" + desc = "A soft Teshari cloak made for the " + JOB_RESEARCH_DIRECTOR icon_state = "tesh_cloak_rd" /obj/item/clothing/suit/storage/teshari/cloak/jobs/sci @@ -624,7 +624,7 @@ /obj/item/clothing/suit/storage/teshari/beltcloak/jobs/ce name = "chief engineer belted cloak" - desc = "A soft Teshari cloak made the Chief Engineer" + desc = "A soft Teshari cloak made for the " + JOB_CHIEF_ENGINEER icon_state = "tesh_beltcloak_ce" /obj/item/clothing/suit/storage/teshari/beltcloak/jobs/engineer @@ -634,7 +634,7 @@ /obj/item/clothing/suit/storage/teshari/beltcloak/jobs/atmos name = "atmospherics belted cloak" - desc = "A soft Teshari cloak made for the Atmospheric Technician" + desc = "A soft Teshari cloak made for the " + JOB_ATMOSPHERIC_TECHNICIAN icon_state = "tesh_beltcloak_atmos" /obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cmo diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index c90e714bf9..2ae7692a7a 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -164,7 +164,7 @@ //When the wearer gets hit, this armor will teleport the user a short distance away (to safety or to more danger, no one knows. That's the fun of it!) /obj/item/clothing/suit/armor/reactive name = "Reactive Teleport Armor" - desc = "Someone separated our Research Director from their own head!" + desc = "Someone separated our " + JOB_RESEARCH_DIRECTOR + " from their own head!" var/active = 0.0 icon_state = "reactiveoff" item_state_slots = list(slot_r_hand_str = "armor_reflec_old", slot_l_hand_str = "armor_reflec_old") diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index 0e5d4d938b..d54d9f360f 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -102,7 +102,7 @@ /obj/item/clothing/suit/storage/toggle/labcoat/rd name = "research director's labcoat" - desc = "A flashy labcoat with purple markings. It belongs to the Research Director." + desc = "A flashy labcoat with purple markings. It belongs to the " + JOB_RESEARCH_DIRECTOR + "." icon_state = "labcoat_rd" item_state_slots = list(slot_r_hand_str = "science_labcoat", slot_l_hand_str = "science_labcoat") diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm index 00b0ed43f9..6193f3b9c1 100644 --- a/code/modules/clothing/under/jobs/medsci.dm +++ b/code/modules/clothing/under/jobs/medsci.dm @@ -2,7 +2,7 @@ * Science */ /obj/item/clothing/under/rank/research_director - desc = "It's a jumpsuit worn by those with the know-how to achieve the position of \"Research Director\". Its fabric provides minor protection from biological contaminants." + desc = "It's a jumpsuit worn by those with the know-how to achieve the position of \"" + JOB_RESEARCH_DIRECTOR + "\". Its fabric provides minor protection from biological contaminants." name = "research director's jumpsuit" icon_state = "director" armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) diff --git a/code/modules/clothing/under/xenos/teshari.dm b/code/modules/clothing/under/xenos/teshari.dm index e116ec32fa..01f3de9563 100644 --- a/code/modules/clothing/under/xenos/teshari.dm +++ b/code/modules/clothing/under/xenos/teshari.dm @@ -232,7 +232,7 @@ /obj/item/clothing/under/teshari/undercoat/jobs/ce name = "cheif engineer undercoat" - desc = "A traditional Teshari garb made for the Chief Engineer" + desc = "A traditional Teshari garb made for the " + JOB_CHIEF_ENGINEER icon_state = "tesh_uniform_ce" /obj/item/clothing/under/teshari/undercoat/jobs/hos @@ -242,7 +242,7 @@ /obj/item/clothing/under/teshari/undercoat/jobs/rd name = "research director undercoat" - desc = "A traditional Teshari garb made for the Research Director" + desc = "A traditional Teshari garb made for the " + JOB_RESEARCH_DIRECTOR icon_state = "tesh_uniform_rd" /obj/item/clothing/under/teshari/undercoat/jobs/engineer @@ -252,7 +252,7 @@ /obj/item/clothing/under/teshari/undercoat/jobs/atmos name = "atmospherics undercoat" - desc = "A traditional Teshari garb made for the Atmospheric Technician" + desc = "A traditional Teshari garb made for the " + JOB_ATMOSPHERIC_TECHNICIAN icon_state = "tesh_uniform_atmos" /obj/item/clothing/under/teshari/undercoat/jobs/cmo diff --git a/code/modules/events/event_dynamic.dm b/code/modules/events/event_dynamic.dm index 28383109af..e1f0f18c48 100644 --- a/code/modules/events/event_dynamic.dm +++ b/code/modules/events/event_dynamic.dm @@ -30,7 +30,7 @@ var/list/event_last_fired = list() var/minutes_passed = world.time/600 var/list/active_with_role = number_active_with_role() - //var/engineer_count = number_active_with_role("Engineer") + //var/engineer_count = number_active_with_role(JOB_ENGINEER) //var/security_count = number_active_with_role("Security") //var/medical_count = number_active_with_role("Medical") //var/AI_count = number_active_with_role("AI") @@ -56,23 +56,23 @@ var/list/event_last_fired = list() possibleEvents[/datum/event/money_hacker] = max(min(25, player_list.len) * 4, 200) - possibleEvents[/datum/event/carp_migration] = 20 + 10 * active_with_role["Engineer"] + possibleEvents[/datum/event/carp_migration] = 20 + 10 * active_with_role[JOB_ENGINEER] possibleEvents[/datum/event/brand_intelligence] = 20 + 25 * active_with_role["Janitor"] - possibleEvents[/datum/event/rogue_drone] = 5 + 25 * active_with_role["Engineer"] + 25 * active_with_role["Security"] + possibleEvents[/datum/event/rogue_drone] = 5 + 25 * active_with_role[JOB_ENGINEER] + 25 * active_with_role["Security"] possibleEvents[/datum/event/infestation] = 100 + 100 * active_with_role["Janitor"] possibleEvents[/datum/event/communications_blackout] = 50 + 25 * active_with_role["AI"] + active_with_role["Scientist"] * 25 - possibleEvents[/datum/event/ionstorm] = active_with_role["AI"] * 25 + active_with_role["Cyborg"] * 25 + active_with_role["Engineer"] * 10 + active_with_role["Scientist"] * 5 - possibleEvents[/datum/event/grid_check] = 25 + 10 * active_with_role["Engineer"] - possibleEvents[/datum/event/electrical_storm] = 15 * active_with_role["Janitor"] + 5 * active_with_role["Engineer"] - possibleEvents[/datum/event/wallrot] = 30 * active_with_role["Engineer"] + 50 * active_with_role["Gardener"] + possibleEvents[/datum/event/ionstorm] = active_with_role["AI"] * 25 + active_with_role["Cyborg"] * 25 + active_with_role[JOB_ENGINEER] * 10 + active_with_role["Scientist"] * 5 + possibleEvents[/datum/event/grid_check] = 25 + 10 * active_with_role[JOB_ENGINEER] + possibleEvents[/datum/event/electrical_storm] = 15 * active_with_role["Janitor"] + 5 * active_with_role[JOB_ENGINEER] + possibleEvents[/datum/event/wallrot] = 30 * active_with_role[JOB_ENGINEER] + 50 * active_with_role["Gardener"] if(!spacevines_spawned) - possibleEvents[/datum/event/spacevine] = 10 + 5 * active_with_role["Engineer"] + possibleEvents[/datum/event/spacevine] = 10 + 5 * active_with_role[JOB_ENGINEER] if(minutes_passed >= 30) // Give engineers time to set up engine - possibleEvents[/datum/event/meteor_wave] = 10 * active_with_role["Engineer"] - possibleEvents[/datum/event/blob] = 10 * active_with_role["Engineer"] + possibleEvents[/datum/event/meteor_wave] = 10 * active_with_role[JOB_ENGINEER] + possibleEvents[/datum/event/blob] = 10 * active_with_role[JOB_ENGINEER] if(active_with_role["Medical"] > 0) possibleEvents[/datum/event/radiation_storm] = active_with_role["Medical"] * 10 @@ -179,7 +179,7 @@ var/list/event_last_fired = list() // Note that this isn't sorted by department, because e.g. having a roboticist shouldn't make meteors spawn. /proc/number_active_with_role() var/list/active_with_role = list() - active_with_role["Engineer"] = 0 + active_with_role[JOB_ENGINEER] = 0 active_with_role["Medical"] = 0 active_with_role["Security"] = 0 active_with_role["Scientist"] = 0 @@ -198,7 +198,7 @@ var/list/event_last_fired = list() var/mob/living/silicon/robot/R = M if(R.module) if(istype(R.module, /obj/item/weapon/robot_module/robot/engineering)) - active_with_role["Engineer"]++ + active_with_role[JOB_ENGINEER]++ else if(istype(R.module, /obj/item/weapon/robot_module/robot/security)) active_with_role["Security"]++ else if(istype(R.module, /obj/item/weapon/robot_module/robot/medical)) @@ -211,7 +211,7 @@ var/list/event_last_fired = list() active_with_role["Botanist"]++ if(M.mind.assigned_role in SSjob.get_job_titles_in_department(DEPARTMENT_ENGINEERING)) - active_with_role["Engineer"]++ + active_with_role[JOB_ENGINEER]++ if(M.mind.assigned_role in SSjob.get_job_titles_in_department(DEPARTMENT_MEDICAL)) active_with_role["Medical"]++ diff --git a/code/modules/flufftext/Dreaming.dm b/code/modules/flufftext/Dreaming.dm index 93c74acca2..24686b3ce4 100644 --- a/code/modules/flufftext/Dreaming.dm +++ b/code/modules/flufftext/Dreaming.dm @@ -6,8 +6,8 @@ var/list/dreams = list( "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 " + 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 " + JOB_HEAD_OF_PERSONNEL,"the " + JOB_HEAD_OF_SECURITY,"the " + JOB_CHIEF_ENGINEER,"the " + JOB_RESEARCH_DIRECTOR,"the Chief Medical Officer", + "the " + JOB_DETECTIVE,"the " + JOB_WARDEN,"an Internal Affairs Agent","an " + JOB_ENGINEER,"the Janitor","the " + JOB_ATMOSPHERIC_TECHNICIAN, "the Quartermaster","a Cargo Technician","the Botanist","a " + JOB_SHAFT_MINER,"the Psychologist","the 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", diff --git a/code/modules/games/cah_white_cards.dm b/code/modules/games/cah_white_cards.dm index 74789d1504..85269ba2c9 100644 --- a/code/modules/games/cah_white_cards.dm +++ b/code/modules/games/cah_white_cards.dm @@ -13,12 +13,12 @@ "An Unathi who WON'T STOP FIGHTING", "Tajaran fetishists", "Bald thirty-year-olds", - "A Chief Engineer who can't setup the engine", + "A " + JOB_CHIEF_ENGINEER + " who can't setup the engine", "Being sucked out into space", "Officer Beepsky", "Engineering", "The grey tide.", - "The Research Director", + "The " + JOB_RESEARCH_DIRECTOR, "Fucking synths", "Man-eating purple pod plants", "Chemical sprayers filled with lube", 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 e93ecd1629..15a46c2d35 100644 --- a/code/modules/lore_codex/legal_code_data/corporate_regulations.dm +++ b/code/modules/lore_codex/legal_code_data/corporate_regulations.dm @@ -151,7 +151,7 @@ suggested_punishments = "50 thaler fine. Demotion at discretion of Superior." suggested_fine = 50 notes = "For this charge to apply, the order must be lawful, reasonable, and the person being ordered to do it must have been able to do so. \ - This includes orders from someone who is not necessarily the direct superior of the offender, but has authority in that context, for instance the Chief Engineer \ + This includes orders from someone who is not necessarily the direct superior of the offender, but has authority in that context, for instance the " + JOB_CHIEF_ENGINEER + " \ giving an order about engineering matters." /datum/lore/codex/page/law/littering diff --git a/code/modules/lore_codex/legal_code_data/sop.dm b/code/modules/lore_codex/legal_code_data/sop.dm index 9f1375733e..f291d11492 100644 --- a/code/modules/lore_codex/legal_code_data/sop.dm +++ b/code/modules/lore_codex/legal_code_data/sop.dm @@ -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 " + JOB_SITE_MANAGER + ", Head of Personnel, Chief Engineer, " + JOB_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, " + JOB_CHIEF_ENGINEER + ", " + JOB_HEAD_OF_SECURITY + ", and " + JOB_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

\ @@ -171,12 +171,12 @@

Ejection Procedure

\ The Supermatter's isolation chamber contains a mass driver and a heavy blast door leading into space. Ejecting the Supermatter into the void \ will cause it to delaminate, however hopefully far away from your facility. Supermatter crystals are rare and expensive, so this option should \ - only be used if delamination cannot be stopped by any other means. A special button, behind glass, exists inside the Chief Engineer's office. \ + only be used if delamination cannot be stopped by any other means. A special button, behind glass, exists inside the " + JOB_CHIEF_ENGINEER + "'s office. \ The button controls the mass driver, however it should not be the first button to press. The blast door leading into space must be opened first, \ or else the Supermatter cannot be ejected. Premature ejection can cause the Supermatter to not be on the mass driver, which will require an extremely \ - risky manual Supermatter movement to place onto the mass driver again. The blast door can be opened with a button in the Chief Engineer's office, or inside the engine room. \ + risky manual Supermatter movement to place onto the mass driver again. The blast door can be opened with a button in the " + JOB_CHIEF_ENGINEER + "'s office, or inside the engine room. \ It is the same button used to 'vent' the engine core. Make use of engine core cameras to verify that the blast door is open. \ - The Chief Engineer should be the one to oversee Ejection. If one does not exist, the facility's AI should initiate Ejection. If there is no AI, \ + The " + JOB_CHIEF_ENGINEER + " should be the one to oversee Ejection. If one does not exist, the facility's AI should initiate Ejection. If there is no AI, \ it would be prudent for an Engineering member to forcefully enter to press the required buttons." /* @@ -273,7 +273,7 @@ not to be placed inside an MMI. Still-living persons who wish to be placed inside an MMI should be ignored.\
\ Lawbound Synthetics are to not have their lawset tampered with. Any errors with the lawset, intentional or resulting from an ionic storm, should \ - be reset by the Research Director or Chief Engineer. If they are unavailable, it is permissible for Robotics to do the reset. Lawbound Synthetics \ + be reset by the " + JOB_RESEARCH_DIRECTOR + " or " + JOB_CHIEF_ENGINEER + ". If they are unavailable, it is permissible for Robotics to do the reset. Lawbound Synthetics \ physically harmed should be repaired.\
\

Lawing Synthetics

\ diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm index d3b569a113..a29cbd9c86 100644 --- a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm +++ b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm @@ -777,7 +777,7 @@ // The RD's pet slime. /mob/living/simple_mob/slime/xenobio/rainbow/kendrick name = "Kendrick" - desc = "The Research Director's pet slime. It shifts colors constantly." + desc = "The " + JOB_RESEARCH_DIRECTOR + "'s pet slime. It shifts colors constantly." rainbow_core_candidate = FALSE // Doing pacify() in initialize() won't actually pacify the AI due to the ai_holder not existing due to parent initialize() not being called yet. // Instead lets just give them an ai_holder that does that for us. diff --git a/code/modules/mob/new_player/skill.dm b/code/modules/mob/new_player/skill.dm index ac089a1d76..2ac31508e2 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, JOB_SECURITY_OFFICER = SKILL_SECURITY_OFFICER, "Chemist" = SKILL_CHEMIST) +var/global/list/SKILL_PRE = list(JOB_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/paper.dm b/code/modules/paperwork/paper.dm index 55546b3c22..353173dad9 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -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
\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" + 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
\n" + JOB_ATMOSPHERIC_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
\n" + JOB_ENGINEER + " 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/power/singularity/act.dm b/code/modules/power/singularity/act.dm index 51c53138fa..6259dad876 100644 --- a/code/modules/power/singularity/act.dm +++ b/code/modules/power/singularity/act.dm @@ -16,7 +16,7 @@ /mob/living/carbon/human/singularity_act() var/gain = 20 if(mind) - if((mind.assigned_role == "Engineer") || (mind.assigned_role == "Chief Engineer")) + if((mind.assigned_role == JOB_ENGINEER) || (mind.assigned_role == JOB_CHIEF_ENGINEER)) gain = 100 if(mind.assigned_role == USELESS_JOB) //VOREStation Edit - Visitor not Assistant gain = rand(0, 300) diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index bda7d2d669..0ce6aab8ab 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -1475,8 +1475,8 @@ //PastelPrinceDan - Kiyoshi/Masumi Maki /obj/item/toy/plushie/fluff/slimeowshi - name = "Slime-Cat Research Director plushie" - desc = "An adorable stuffed toy that resembles a slime. It's pink, and has little cat ears, as well as a tail! Atop its head is a small beret with a Research Director's insignia." + name = "Slime-Cat " + JOB_RESEARCH_DIRECTOR + " plushie" + desc = "An adorable stuffed toy that resembles a slime. It's pink, and has little cat ears, as well as a tail! Atop its head is a small beret with a " + JOB_RESEARCH_DIRECTOR + "'s insignia." icon = 'icons/vore/custom_items_vr.dmi' icon_state = "kimeowshi" attack_verb = list("blorbled", "slimed", "absorbed", "glomped")