diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 3be28243ae53..2fab6bf1e740 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -76,6 +76,9 @@ greyscale_colors = COLOR_JOB_DEFAULT icon_state = "/obj/item/clothing/suit/apron/overalls/grey" +/obj/item/clothing/suit/apron/overalls/scientist + greyscale_colors = COLOR_JOB_SCI_GENERIC + //Captain /obj/item/clothing/suit/jacket/capjacket name = "captain's parade jacket" diff --git a/code/modules/clothing/under/costume.dm b/code/modules/clothing/under/costume.dm index 354d58d047d8..05ec6cf55d60 100644 --- a/code/modules/clothing/under/costume.dm +++ b/code/modules/clothing/under/costume.dm @@ -282,6 +282,14 @@ icon_state = "/obj/item/clothing/under/costume/buttondown/slacks/service" greyscale_colors = "#EEEEEE#CBDBFC#17171B#222227" +/obj/item/clothing/under/costume/buttondown/slacks/service/alt_style //automatically rolled up + adjusted = ALT_STYLE // for some reason this doesn't always work + flags_1 = parent_type::flags_1 | NO_NEW_GAGS_PREVIEW_1 + +/obj/item/clothing/under/costume/buttondown/slacks/service/alt_style/Initialize(mapload) + . = ..() + adjust_to_alt() + /obj/item/clothing/under/costume/buttondown/shorts name = "button-down shirt with shorts" desc = "A fancy button-down shirt with shorts." diff --git a/code/modules/jobs/job_types/scientist.dm b/code/modules/jobs/job_types/scientist.dm index 43d7c63750ae..6757ec5e9ea8 100644 --- a/code/modules/jobs/job_types/scientist.dm +++ b/code/modules/jobs/job_types/scientist.dm @@ -3,6 +3,7 @@ description = "Do experiments, perform research, feed the slimes, make bombs." title_options = list( "Junior Scientist", + "Scientific Technician" = /datum/outfit/job/scientist/technician, ) department_head = list(JOB_RESEARCH_DIRECTOR) faction = FACTION_STATION @@ -81,3 +82,13 @@ /datum/outfit/job/scientist/consistent/try_giving_horrible_tie() return + +/datum/outfit/job/scientist/technician // the kinda stuff gordon freeman seems to be despite the PHD + name = "Scientific Technician" + id_trim = /datum/id_trim/job/scientist/technician + neck = /obj/item/clothing/neck/tie/black/tied + uniform = /obj/item/clothing/under/costume/buttondown/slacks/service/alt_style // unnecessarily fancy but we are going for a reference + suit = /obj/item/clothing/suit/apron/overalls/scientist + shoes = /obj/item/clothing/shoes/laceup + glasses = /obj/item/clothing/glasses/science + gloves = /obj/item/clothing/gloves/color/white diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index 7d2cb3d9a82e..c298d25c4592 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -243,6 +243,7 @@ /obj/item/clothing/under/rank/rnd/scientist/skirt = 3, /obj/item/clothing/suit/toggle/labcoat/science = 3, /obj/item/clothing/suit/hooded/wintercoat/science = 3, + /obj/item/clothing/suit/apron/overalls/scientist = 3, /obj/item/clothing/gloves/latex = 3, /obj/item/clothing/shoes/sneakers/white = 3, /obj/item/storage/backpack/science = 3, diff --git a/icons/map_icons/clothing/suit/_suit.dmi b/icons/map_icons/clothing/suit/_suit.dmi index fd3717d45378..3ba639fb5984 100644 Binary files a/icons/map_icons/clothing/suit/_suit.dmi and b/icons/map_icons/clothing/suit/_suit.dmi differ diff --git a/maplestation_modules/code/datums/id_trim/jobs.dm b/maplestation_modules/code/datums/id_trim/jobs.dm index 34a7c55a0bae..cf19d79d46fe 100644 --- a/maplestation_modules/code/datums/id_trim/jobs.dm +++ b/maplestation_modules/code/datums/id_trim/jobs.dm @@ -19,7 +19,6 @@ ACCESS_MINERAL_STOREROOM, ACCESS_RESEARCH, ACCESS_SCIENCE, - ACCESS_TECH_STORAGE, ) extra_access = list( ACCESS_GENETICS, @@ -29,6 +28,14 @@ ACCESS_XENOBIOLOGY, ) +/datum/id_trim/job/scientist/technician + assignment = "Scientific Technician" + honorifics = list("Researcher", "Technician") + +/datum/id_trim/job/scientist/technician/New() + . = ..() + minimal_access |= ACCESS_TECH_STORAGE + /datum/id_trim/job/quartermaster trim_state = "trim_quartermaster" trim_icon = 'maplestation_modules/icons/obj/card.dmi'