diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index a023299a9f..6c4e3b8f6e 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -11,6 +11,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) spawn_positions = 1 supervisors = "company officials and Corporate Regulations" selection_color = "#ccccff" + alt_titles = list("Station Administrator") idtype = /obj/item/weapon/card/id/gold req_admin_notify = 1 access = list() //See get_access() diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 7da3c6c305..34b11efcd4 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -268,6 +268,8 @@ new /obj/item/clothing/under/det(src) new /obj/item/clothing/under/det/grey(src) new /obj/item/clothing/under/det/black(src) + new /obj/item/clothing/under/det/waistcoat(src) + new /obj/item/clothing/under/det/grey/waistcoat(src) new /obj/item/clothing/suit/storage/det_trench(src) new /obj/item/clothing/suit/storage/det_trench/grey(src) new /obj/item/clothing/suit/storage/forensics/blue(src) diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index 729aad8b42..c2d970b8cf 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -453,84 +453,98 @@ var/global/list/gear_datums = list() path = /obj/item/clothing/under/rank/chief_engineer/skirt slot = slot_w_uniform cost = 1 + allowed_roles = list("Chief Engineer") /datum/gear/skirt_atmos display_name = "skirt, atmos" path = /obj/item/clothing/under/rank/atmospheric_technician/skirt slot = slot_w_uniform cost = 1 + allowed_roles = list("Chief Engineer","Atmospheric Technician") /datum/gear/skirt_eng display_name = "skirt, engineer" path = /obj/item/clothing/under/rank/engineer/skirt slot = slot_w_uniform cost = 1 + allowed_roles = list("Chief Engineer","Station Engineer") /datum/gear/skirt_cmo display_name = "skirt, cmo" path = /obj/item/clothing/under/rank/chief_medical_officer slot = slot_w_uniform cost = 1 + allowed_roles = list("Chief Medical Officer") /datum/gear/skirt_chem display_name = "skirt, chemist" path = /obj/item/clothing/under/rank/chemist/skirt slot = slot_w_uniform cost = 1 + allowed_roles = list("Chief Medical Officer","Chemist") /datum/gear/skirt_viro display_name = "skirt, virologist" path = /obj/item/clothing/under/rank/virologist/skirt slot = slot_w_uniform cost = 1 + allowed_roles = list("Chief Medical Officer","Medical Doctor") /datum/gear/skirt_med display_name = "skirt, medical" path = /obj/item/clothing/under/rank/medical/skirt slot = slot_w_uniform cost = 1 + allowed_roles = list("Chief Medical Officer","Medical Doctor","Paramedic") /datum/gear/skirt_sci display_name = "skirt, scientist" path = /obj/item/clothing/under/rank/scientist/skirt slot = slot_w_uniform cost = 1 + allowed_roles = list("Research Director","Scientist") /datum/gear/skirt_qm display_name = "skirt, QM" path = /obj/item/clothing/under/rank/cargo/skirt slot = slot_w_uniform cost = 1 + allowed_roles = list("Quartermaster") /datum/gear/jeans_qm display_name = "jeans, QM" path = /obj/item/clothing/under/rank/cargo/jeans slot = slot_w_uniform cost = 1 + allowed_roles = list("Quartermaster") /datum/gear/jeans_qmf display_name = "female jeans, QM" path = /obj/item/clothing/under/rank/cargo/jeans/female slot = slot_w_uniform cost = 1 + allowed_roles = list("Quartermaster") /datum/gear/skirt_cargo display_name = "skirt, cargo" path = /obj/item/clothing/under/rank/cargotech/skirt slot = slot_w_uniform cost = 1 + allowed_roles = list("Quartermaster","Cargo Technician") /datum/gear/jeans_cargo display_name = "jeans, cargo" path = /obj/item/clothing/under/rank/cargotech/jeans slot = slot_w_uniform cost = 1 + allowed_roles = list("Quartermaster","Cargo Technician") /datum/gear/jeans_cargof display_name = "female jeans, cargo" path = /obj/item/clothing/under/rank/cargotech/jeans/female slot = slot_w_uniform cost = 1 + allowed_roles = list("Quartermaster","Cargo Technician") /datum/gear/classicjeans display_name = "pants, classic jeans" @@ -1240,6 +1254,20 @@ var/global/list/gear_datums = list() slot = slot_wear_suit whitelisted = "Tajara" // You do have a monopoly on a fur suit tho +/datum/gear/forensics/red + display_name = "forensics, red" + path = /obj/item/clothing/suit/storage/forensics/red/long + cost = 2 + slot = slot_wear_suit + allowed_roles = list("Detective") + +/datum/gear/forensics/blue + display_name = "forensics, blue" + path = /obj/item/clothing/suit/storage/forensics/blue/long + cost = 2 + slot = slot_wear_suit + allowed_roles = list("Detective") + // Gloves /datum/gear/black_gloves @@ -1419,6 +1447,49 @@ var/global/list/gear_datums = list() cost = 1 slot = slot_shoes +/datum/gear/flats_black + display_name = "flats, black" + path = /obj/item/clothing/shoes/flats + cost = 1 + slot = slot_shoes + +/datum/gear/flats_blue + display_name = "flats, blue" + path = /obj/item/clothing/shoes/flats/blue + cost = 1 + slot = slot_shoes + +/datum/gear/flats_brown + display_name = "flats, brown" + path = /obj/item/clothing/shoes/flats/brown + cost = 1 + slot = slot_shoes + +/datum/gear/flats_orange + display_name = "flats, orange" + path = /obj/item/clothing/shoes/flats/orange + cost = 1 + slot = slot_shoes + +/datum/gear/flats_purple + display_name = "flats, purple" + path = /obj/item/clothing/shoes/flats/purple + cost = 1 + slot = slot_shoes + +/datum/gear/flats_red + display_name = "flats, red" + path = /obj/item/clothing/shoes/flats/red + cost = 1 + slot = slot_shoes + +/datum/gear/flats_white + display_name = "flats, white" + path = /obj/item/clothing/shoes/flats/white + cost = 1 + slot = slot_shoes + + // "Useful" items - I'm guessing things that might be used at work? /datum/gear/briefcase diff --git a/code/modules/clothing/shoes/colour.dm b/code/modules/clothing/shoes/colour.dm index 089f66376f..669047d80a 100644 --- a/code/modules/clothing/shoes/colour.dm +++ b/code/modules/clothing/shoes/colour.dm @@ -8,6 +8,7 @@ heat_protection = FEET max_heat_protection_temperature = SHOE_MAX_HEAT_PROTECTION_TEMPERATURE + /obj/item/clothing/shoes/brown name = "brown shoes" desc = "A pair of brown shoes." @@ -53,6 +54,41 @@ desc = "Very gay shoes." icon_state = "rain_bow" +/obj/item/clothing/shoes/flats + name = "black flats" + desc = "Sleek black flats." + icon_state = "flatsblack" + +/obj/item/clothing/shoes/flats/white + name = "white flats" + desc = "Shiny white flats." + icon_state = "flatswhite" + +/obj/item/clothing/shoes/flats/red + name = "red flats" + desc = "Ruby red flats." + icon_state = "flatsred" + +/obj/item/clothing/shoes/flats/purple + name = "purple flats" + desc = "Royal purple flats." + icon_state = "flatspurple" + +/obj/item/clothing/shoes/flats/blue + name = "blue flats" + desc = "Sleek blue flats." + icon_state = "flatsblue" + +/obj/item/clothing/shoes/flats/brown + name = "brown flats" + desc = "Sleek brown flats." + icon_state = "flatsbrown" + +/obj/item/clothing/shoes/flats/orange + name = "orange flats" + desc = "Radiant orange flats." + icon_state = "flatsorange" + /obj/item/clothing/shoes/orange name = "orange shoes" icon_state = "orange" diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index e5044da7be..c06198b287 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -117,11 +117,21 @@ desc = "A red forensics technician jacket." icon_state = "forensics_red" +/obj/item/clothing/suit/storage/forensics/red/long + name = "long red jacket" + desc = "A long red forensics technician jacket." + icon_state = "forensics_red_long" + /obj/item/clothing/suit/storage/forensics/blue name = "blue jacket" desc = "A blue forensics technician jacket." icon_state = "forensics_blue" +/obj/item/clothing/suit/storage/forensics/blue/long + name = "long blue jacket" + desc = "A long blue forensics technician jacket." + icon_state = "forensics_blue_long" + //Engineering /obj/item/clothing/suit/storage/hazardvest name = "hazard vest" diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index ca0e832952..4d1387ad4e 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -110,6 +110,16 @@ worn_state = "det_corporate" desc = "A more modern uniform for corporate investigators." +/obj/item/clothing/under/det/waistcoat + icon_state = "detective_waistcoat" + worn_state = "detective_waistcoat" + desc = "A rumpled white dress shirt paired with well-worn grey slacks, complete with a blue striped tie, faux-gold tie clip, and waistcoat." + +/obj/item/clothing/under/det/grey/waistcoat + icon_state = "detective2_waistcoat" + worn_state = "detective2_waistcoat" + desc = "A serious-looking tan dress shirt paired with freshly-pressed black slacks, complete with a red striped tie and waistcoat." + /obj/item/clothing/head/det name = "fedora" desc = "A brown fedora - either the cornerstone of a detective's style or a poor attempt at looking cool, depending on the person wearing it." diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm index f8578168aa..b4fcec3e98 100644 --- a/code/modules/mob/new_player/sprite_accessories.dm +++ b/code/modules/mob/new_player/sprite_accessories.dm @@ -406,6 +406,22 @@ name = "Volaju" icon_state = "hair_volaju" + eighties + name = "80's" + icon_state = "hair_80s" + + nia + name = "Nia" + icon_state = "hair_nia" + + unkept + name = "Unkept" + icon_state = "hair_unkept" + + modern + name = "Modern" + icon_state = "hair_modern" + bald name = "Bald" icon_state = "bald" diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi index 8e0d420161..c1936a6fc5 100644 Binary files a/icons/mob/feet.dmi and b/icons/mob/feet.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 260a2c73c3..4cc00ae37f 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi index e8fec9b887..b1d2bc3ea0 100644 Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index cc5e415c47..92df4aa0b3 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 5bdb9b8ab5..4ec1db2fbd 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 2f7bb6d374..8a1659dc9d 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi index 861b118894..2f191e20c3 100644 Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 7ab2c39374..6a98d26ddd 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 649a1af0a1..188c546d22 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ