Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions code/modules/clothing/suits/jobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 8 additions & 0 deletions code/modules/clothing/under/costume.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
11 changes: 11 additions & 0 deletions code/modules/jobs/job_types/scientist.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
1 change: 1 addition & 0 deletions code/modules/vending/wardrobes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Binary file modified icons/map_icons/clothing/suit/_suit.dmi
Binary file not shown.
9 changes: 8 additions & 1 deletion maplestation_modules/code/datums/id_trim/jobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
ACCESS_MINERAL_STOREROOM,
ACCESS_RESEARCH,
ACCESS_SCIENCE,
ACCESS_TECH_STORAGE,
)
extra_access = list(
ACCESS_GENETICS,
Expand All @@ -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'
Expand Down
Loading