diff --git a/code/datums/outfits/jobs/civilian.dm b/code/datums/outfits/jobs/civilian.dm index 8889ae74d1..485e0e6fca 100644 --- a/code/datums/outfits/jobs/civilian.dm +++ b/code/datums/outfits/jobs/civilian.dm @@ -1,5 +1,6 @@ /decl/hierarchy/outfit/job/assistant name = OUTFIT_JOB_NAME("Assistant") + uniform = /obj/item/clothing/under/rank/assistant id_type = /obj/item/card/id/assistant /decl/hierarchy/outfit/job/assistant/visitor @@ -12,6 +13,11 @@ id_pda_assignment = "Resident" uniform = /obj/item/clothing/under/color/white +/decl/hierarchy/outfit/job/assistant/engineering + name = OUTFIT_JOB_NAME("Technical Assistant") + id_pda_assignment = "Technical Assistant" + uniform = /obj/item/clothing/under/rank/assistant/engineer + /decl/hierarchy/outfit/job/service l_ear = /obj/item/radio/headset/headset_service hierarchy_type = /decl/hierarchy/outfit/job/service diff --git a/code/datums/outfits/jobs/engineering.dm b/code/datums/outfits/jobs/engineering.dm index 43257723ed..9cdcd7c6d0 100644 --- a/code/datums/outfits/jobs/engineering.dm +++ b/code/datums/outfits/jobs/engineering.dm @@ -13,7 +13,7 @@ /decl/hierarchy/outfit/job/engineering/chief_engineer name = OUTFIT_JOB_NAME("Chief engineer") head = /obj/item/clothing/head/hardhat/white - uniform = /obj/item/clothing/under/rank/chief_engineer + uniform = /obj/item/clothing/under/rank/chief_engineer{ starting_accessories=list(/obj/item/clothing/accessory/storage/overalls/chief) } l_ear = /obj/item/radio/headset/heads/ce gloves = /obj/item/clothing/gloves/black id_type = /obj/item/card/id/engineering/head @@ -23,12 +23,15 @@ name = OUTFIT_JOB_NAME("Engineer") head = /obj/item/clothing/head/hardhat uniform = /obj/item/clothing/under/rank/engineer + suit = /obj/item/clothing/suit/storage/hazardvest id_type = /obj/item/card/id/engineering pda_type = /obj/item/pda/engineering /decl/hierarchy/outfit/job/engineering/atmos name = OUTFIT_JOB_NAME("Atmospheric technician") uniform = /obj/item/clothing/under/rank/atmospheric_technician + head = /obj/item/clothing/head/hardhat/dblue + suit = /obj/item/clothing/suit/storage/hazardvest/blue belt = /obj/item/storage/belt/utility/atmostech id_type = /obj/item/card/id/engineering/atmos pda_type = /obj/item/pda/atmos diff --git a/code/game/jobs/job/assistant.dm b/code/game/jobs/job/assistant.dm index df9935fe77..d7825a0872 100644 --- a/code/game/jobs/job/assistant.dm +++ b/code/game/jobs/job/assistant.dm @@ -33,6 +33,7 @@ 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." + title_outfit = /decl/hierarchy/outfit/job/assistant/engineering /datum/alt_title/med_intern title = "Medical Intern" @@ -55,4 +56,4 @@ title = "Resident" title_blurb = "A Resident is an individual who resides on the station, frequently in a different part of the station than what is seen. \ They are considered to be part of the crew for most purposes, but have no real authority." - title_outfit = /decl/hierarchy/outfit/job/assistant/resident \ No newline at end of file + title_outfit = /decl/hierarchy/outfit/job/assistant/resident diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index 86023fb959..976efaf3d3 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -5,6 +5,7 @@ starts_with = list( /obj/item/clothing/accessory/storage/brown_vest, + /obj/item/clothing/accessory/storage/overalls/chief, /obj/item/blueprints, /obj/item/clamp, /obj/item/clamp, @@ -69,6 +70,7 @@ starts_with = list( /obj/item/clothing/accessory/storage/brown_vest, + /obj/item/clothing/accessory/storage/overalls/engineer, /obj/item/storage/toolbox/mechanical, /obj/item/radio/headset/headset_eng, /obj/item/radio/headset/headset_eng/alt, @@ -94,14 +96,16 @@ /obj/structure/closet/secure_closet/atmos_personal - name = "technician's locker" + name = "atmospheric technician's locker" req_access = list(access_atmospherics) closet_appearance = /decl/closet_appearance/secure_closet/engineering/atmos starts_with = list( /obj/item/clothing/accessory/storage/brown_vest, + /obj/item/clothing/accessory/storage/overalls/engineer, /obj/item/clothing/suit/fire/firefighter, /obj/item/clothing/head/hardhat/red, + /obj/item/clothing/head/hardhat/dblue, /obj/item/flashlight, /obj/item/extinguisher, /obj/item/clamp, diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index a4b7b6e0a9..ff310895ed 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -169,6 +169,26 @@ /obj/item/tool/crowbar, /obj/item/tool/screwdriver, /obj/item/weldingtool, /obj/item/tool/wirecutters, /obj/item/tool/wrench, /obj/item/tank/emergency/oxygen, /obj/item/clothing/mask/gas, /obj/item/taperoll/engineering) body_parts_covered = UPPER_TORSO + var/open = 0 //0 is closed, 1 is open, -1 means it won't be able to toggle + +/obj/item/clothing/suit/storage/hazardvest/verb/Toggle() + set name = "Toggle Hazard Vest" + set category = "Object" + set src in usr + if(!usr.canmove || usr.stat || usr.restrained()) + return 0 + if(open == 1) + open = 0 + icon_state = initial(icon_state) + to_chat(usr, "You fasten up the [src]].") + else if(open == 0) + open = 1 + icon_state = "[icon_state]_open" + to_chat(usr, "You unfasten the [src]].") + else + to_chat(usr, "You attempt to button-up the velcro on your [src], before promptly realising how silly you are.") + return + update_clothing_icon() /obj/item/clothing/suit/storage/hazardvest/blue name = "blue hazard vest" @@ -182,7 +202,7 @@ /obj/item/clothing/suit/storage/hazardvest/white name = "white hazard vest" - desc = "A high-visibility vest used in work zones. This one has a red cross!" + desc = "A high-visibility vest used in work zones. This one is white!" icon_state = "hazard_w" //Lawyer @@ -245,4 +265,4 @@ icon = 'icons/obj/clothing/belts.dmi' icon_state = "suspenders" blood_overlay_type = "armor" //it's the less thing that I can put here - body_parts_covered = 0 \ No newline at end of file + body_parts_covered = 0 diff --git a/code/modules/clothing/under/accessories/storage.dm b/code/modules/clothing/under/accessories/storage.dm index 45d5cb6ac5..a743e73ca8 100644 --- a/code/modules/clothing/under/accessories/storage.dm +++ b/code/modules/clothing/under/accessories/storage.dm @@ -103,3 +103,17 @@ new /obj/item/material/knife/machete/hatchet/unathiknife(hold) new /obj/item/material/knife/machete/hatchet/unathiknife(hold) + +/obj/item/clothing/accessory/storage/overalls + name = "overalls" + desc = "Heavy-duty overalls for use on the work site, with plenty of convenient pockets to boot." + icon_state = "mining_overalls" + +/obj/item/clothing/accessory/storage/overalls/engineer + name = "engineer's overalls" + icon_state = "engineering_overalls" + +/obj/item/clothing/accessory/storage/overalls/chief + name = "chief engineer's overalls" + desc = "Heavy duty overalls, bleached white to signify a \"Chief Engineer.\" Keeping them clean until the end of shift is a challenge unto itself." + icon_state = "ce_overalls" diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index a946b5e781..f7d95534cb 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -1,5 +1,15 @@ //Alphabetical order of civilian jobs. +/obj/item/clothing/under/rank/assistant + name = "assistant's uniform" + desc = "A NanoTrasen-branded jumpsuit in fetching ocean grey." + icon_state = "assistant" + +/obj/item/clothing/under/rank/assistant/engineer + name = "technical assistant's uniform" + desc = "A NanoTrasen-branded jumpsuit in fetching ocean grey with engineering yellow accents." + icon_state = "assistant_eng" + /obj/item/clothing/under/rank/bartender desc = "It looks like it could use some more flair." name = "bartender's uniform" diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index dc1cc277f2..a67b747e95 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/species/teshari/head.dmi b/icons/mob/species/teshari/head.dmi index d362b8b592..d2dd22e8dd 100644 Binary files a/icons/mob/species/teshari/head.dmi and b/icons/mob/species/teshari/head.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 73c59d73db..da2ae999a9 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index a6f3295a25..169ad47c46 100644 Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 4ccb0755d1..4b55148274 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/mob/uniform_rolled_down.dmi b/icons/mob/uniform_rolled_down.dmi index b8b4999a4a..440fce9254 100644 Binary files a/icons/mob/uniform_rolled_down.dmi and b/icons/mob/uniform_rolled_down.dmi differ diff --git a/icons/mob/uniform_sleeves_rolled.dmi b/icons/mob/uniform_sleeves_rolled.dmi index 8b767fa4b7..1c0c636387 100644 Binary files a/icons/mob/uniform_sleeves_rolled.dmi and b/icons/mob/uniform_sleeves_rolled.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 5e0d177313..f79b6393a8 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index f0c5ecdfb2..13a3b99f2b 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi index 9bcd47e4c6..0f99bdd490 100644 Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 7cf6a72bbb..f2e1beb456 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ