diff --git a/code/__defines/jobs.dm b/code/__defines/jobs.dm index 6514c52f912..87241a652de 100644 --- a/code/__defines/jobs.dm +++ b/code/__defines/jobs.dm @@ -204,6 +204,7 @@ #define JOB_ALT_ELECTRICIAN "Electrician" #define JOB_ALT_CONSTRUCTION_ENGINEER "Construction Engineer" #define JOB_ALT_ENGINEERING_CONTRACTOR "Engineering Contractor" + #define JOB_ALT_CHEMENGINEER "Chemical Engineer" #define JOB_ALT_COMPUTER_TECHNICIAN "Computer Technician" #define JOB_ALT_SALVAGE_TECHNICIAN "Salvage Technician" #define JOB_ALT_DAMAGE_CONTROL_SPECIALIST "Damage Control Specialist" diff --git a/code/datums/outfits/jobs/engineering.dm b/code/datums/outfits/jobs/engineering.dm index 11c4a4cd3ce..7c9c163cf90 100644 --- a/code/datums/outfits/jobs/engineering.dm +++ b/code/datums/outfits/jobs/engineering.dm @@ -39,3 +39,13 @@ belt = /obj/item/storage/belt/utility/atmostech id_type = /obj/item/card/id/engineering/atmos pda_type = /obj/item/pda/atmos + +/decl/hierarchy/outfit/job/engineering/chems + name = OUTFIT_JOB_NAME(JOB_ALT_CHEMENGINEER) + head = /obj/item/clothing/head/hardhat + uniform = /obj/item/clothing/under/rank/engineer + belt = /obj/item/storage/belt/utility/chemtech + id_type = /obj/item/card/id/engineering/chemical + pda_type = /obj/item/pda + r_pocket = null // no tray + suit = /obj/item/clothing/suit/storage/toggle/labcoat/yellow diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index d1635a9a6b9..b51306f88f3 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -80,7 +80,7 @@ access = list(ACCESS_EVA, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_ATMOSPHERICS) minimal_access = list(ACCESS_EVA, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION) alt_titles = list(JOB_ALT_MAINTENANCE_TECHNICIAN = /datum/alt_title/maint_tech, JOB_ALT_ENGINE_TECHNICIAN = /datum/alt_title/engine_tech, - JOB_ALT_ELECTRICIAN = /datum/alt_title/electrician, JOB_ALT_CONSTRUCTION_ENGINEER = /datum/alt_title/construction_engi, JOB_ALT_ENGINEERING_CONTRACTOR = /datum/alt_title/engineering_contractor, JOB_ALT_COMPUTER_TECHNICIAN = /datum/alt_title/computer_tech, JOB_ALT_SALVAGE_TECHNICIAN = /datum/alt_title/salvage_tech, JOB_ALT_DAMAGE_CONTROL_SPECIALIST = /datum/alt_title/damage_control_specialist) + JOB_ALT_ELECTRICIAN = /datum/alt_title/electrician, JOB_ALT_CONSTRUCTION_ENGINEER = /datum/alt_title/construction_engi, JOB_ALT_ENGINEERING_CONTRACTOR = /datum/alt_title/engineering_contractor, JOB_ALT_COMPUTER_TECHNICIAN = /datum/alt_title/computer_tech, JOB_ALT_SALVAGE_TECHNICIAN = /datum/alt_title/salvage_tech, JOB_ALT_DAMAGE_CONTROL_SPECIALIST = /datum/alt_title/damage_control_specialist, JOB_ALT_CHEMENGINEER = /datum/alt_title/chem_tech) minimal_player_age = 3 min_age_by_species = list(SPECIES_PROMETHEAN = 2) @@ -135,6 +135,11 @@ title = JOB_ALT_DAMAGE_CONTROL_SPECIALIST title_blurb = "A " + JOB_ALT_DAMAGE_CONTROL_SPECIALIST + " is the Engineering Department's answer to first responders like the " + JOB_PARAMEDIC + ", being responsible for stabilizing situations and evacuating personnel, then conducting repairs." +/datum/alt_title/chem_tech + title = JOB_ALT_CHEMENGINEER + title_blurb = "A " + JOB_ALT_CHEMENGINEER + " specializes in industrial scale chemical production. They are responsible for planning the construction of and operating chemical refinery machines." + title_outfit = /decl/hierarchy/outfit/job/engineering/chems + ////////////////////////////////// // Atmos Tech ////////////////////////////////// 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 9d0a45de362..34823cfd1bc 100644 --- a/code/game/objects/items/weapons/id cards/id_stacks.dm +++ b/code/game/objects/items/weapons/id cards/id_stacks.dm @@ -157,6 +157,11 @@ initial_sprite_stack = list("base-stamp-silver", "top-orange", "stamp-n", "pips-gold") rank = JOB_CHIEF_ENGINEER +/obj/item/card/id/engineering/chemical + name = JOB_ALT_CHEMENGINEER + "'s ID" + initial_sprite_stack = list("base-stamp", "top-orange", "stamp-n", "pips-medblu", "stripe-white") + rank = JOB_ENGINEER + //Science /obj/item/card/id/science diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index fe1f99ec53a..adecfd1638a 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -84,7 +84,9 @@ /obj/item/integrated_electronics/debugger, /obj/item/shovel/spade, /obj/item/stack/nanopaste, - /obj/item/geiger + /obj/item/geiger, + /obj/item/reagent_scanner, + /obj/item/lightpainter ) /obj/item/storage/belt/utility/full @@ -108,6 +110,16 @@ /obj/item/multitool ) +/obj/item/storage/belt/utility/chemtech + starts_with = list( + /obj/item/tool/screwdriver, + /obj/item/tool/wrench, + /obj/item/weldingtool, + /obj/item/tool/crowbar, + /obj/item/tool/wirecutters, + /obj/item/reagent_scanner + ) + /obj/item/storage/belt/utility/atmostech starts_with = list( /obj/item/tool/screwdriver, @@ -218,7 +230,9 @@ /obj/item/stack/material/glass, /obj/item/lightreplacer, /obj/item/pickaxe/plasmacutter, - /obj/item/holosign_creator/combifan + /obj/item/holosign_creator/combifan, + /obj/item/reagent_scanner, + /obj/item/lightpainter ) diff --git a/tgui/packages/tgui/interfaces/common/RankIcon.tsx b/tgui/packages/tgui/interfaces/common/RankIcon.tsx index 35e1c9a73d9..c4ec8f90198 100644 --- a/tgui/packages/tgui/interfaces/common/RankIcon.tsx +++ b/tgui/packages/tgui/interfaces/common/RankIcon.tsx @@ -61,6 +61,7 @@ const rank2icon = { Engineer: 'toolbox', 'Maintenance Technician': 'wrench', 'Engine Technician': 'toolbox', + 'Chemical Engineer': ['mortar-pestle', 'wrench'], Electrician: 'screwdriver', 'Construction Engineer': 'trowel-bricks', 'Engineering Contractor': 'ruler', @@ -378,6 +379,7 @@ const rank2color = { Engineer: 'orange', 'Maintenance Technician': 'orange', 'Engine Technician': 'orange', + 'Chemical Engineer': 'orange', Electrician: 'orange', 'Construction Engineer': 'orange', 'Engineering Contractor': 'orange',