diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 821bfad469..79df492a9e 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -1142,8 +1142,9 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee /datum/supply_packs/formal_wear contains = list(/obj/item/clothing/head/bowler, /obj/item/clothing/head/that, + /obj/item/clothing/suit/storage/toggle/internalaffairs, /obj/item/clothing/suit/storage/toggle/lawyer/bluejacket, - /obj/item/clothing/suit/storage/lawyer/purpjacket, + /obj/item/clothing/suit/storage/toggle/lawyer/purpjacket, /obj/item/clothing/under/suit_jacket, /obj/item/clothing/under/suit_jacket/female, /obj/item/clothing/under/suit_jacket/really_black, diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index 588bded4d4..390830e829 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -93,11 +93,24 @@ /obj/structure/closet/lawcloset/New() ..() new /obj/item/clothing/under/lawyer/female(src) + new /obj/item/clothing/under/lawyer/female(src) + new /obj/item/clothing/under/lawyer/black(src) new /obj/item/clothing/under/lawyer/black(src) new /obj/item/clothing/under/lawyer/red(src) + new /obj/item/clothing/under/lawyer/red(src) + new /obj/item/clothing/suit/storage/toggle/internalaffairs(src) + new /obj/item/clothing/suit/storage/toggle/internalaffairs(src) + new /obj/item/clothing/under/lawyer/bluesuit(src) new /obj/item/clothing/under/lawyer/bluesuit(src) new /obj/item/clothing/suit/storage/toggle/lawyer/bluejacket(src) + new /obj/item/clothing/suit/storage/toggle/lawyer/bluejacket(src) new /obj/item/clothing/under/lawyer/purpsuit(src) - new /obj/item/clothing/suit/storage/lawyer/purpjacket(src) + new /obj/item/clothing/under/lawyer/purpsuit(src) + new /obj/item/clothing/suit/storage/toggle/lawyer/purpjacket(src) + new /obj/item/clothing/suit/storage/toggle/lawyer/purpjacket(src) + new /obj/item/clothing/shoes/brown(src) new /obj/item/clothing/shoes/brown(src) new /obj/item/clothing/shoes/black(src) + new /obj/item/clothing/shoes/black(src) + new /obj/item/clothing/shoes/laceup(src) + new /obj/item/clothing/shoes/laceup(src) diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes.dm b/code/modules/client/preference_setup/loadout/loadout_eyes.dm index 66abf14106..b30bc8ff0f 100644 --- a/code/modules/client/preference_setup/loadout/loadout_eyes.dm +++ b/code/modules/client/preference_setup/loadout/loadout_eyes.dm @@ -30,29 +30,33 @@ path = /obj/item/clothing/glasses/science /datum/gear/eyes/security - display_name = "Security HUD" + display_name = "Security HUD (Security)" path = /obj/item/clothing/glasses/hud/security allowed_roles = list("Security Officer","Head of Security","Warden") /datum/gear/eyes/security/prescriptionsec - display_name = "Security HUD, prescription" + display_name = "Security HUD, prescription (Security)" path = /obj/item/clothing/glasses/hud/security/prescription /datum/gear/eyes/medical - display_name = "Medical HUD" + display_name = "Medical HUD (Medical)" path = /obj/item/clothing/glasses/hud/health allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist") /datum/gear/eyes/medical/prescriptionmed - display_name = "Medical HUD, prescription" + display_name = "Medical HUD, prescription (Medical)" path = /obj/item/clothing/glasses/hud/health/prescription /datum/gear/eyes/shades - display_name = "Sunglasses, fat" + display_name = "Sunglasses, fat (Security/Command)" path = /obj/item/clothing/glasses/sunglasses/big allowed_roles = list("Security Officer","Head of Security","Warden","Captain","Head of Personnel","Quartermaster","Internal Affairs Agent","Detective") +/datum/gear/eyes/glasses/fakesun + display_name = "Sunglasses, stylish" + path = /obj/item/clothing/glasses/fakesunglasses + /datum/gear/eyes/shades/prescriptionsun - display_name = "sunglasses, presciption" + display_name = "sunglasses, presciption (Security/Command)" path = /obj/item/clothing/glasses/sunglasses/prescription cost = 2 diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index 20511caa86..6d9a253398 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -166,13 +166,17 @@ path = /obj/item/clothing/suit/unathi/robe cost = 1 +/datum/gear/suit/black_lawyer_jacket + display_name = "suit jacket, black" + path = /obj/item/clothing/suit/storage/toggle/internalaffairs + /datum/gear/suit/blue_lawyer_jacket display_name = "suit jacket, blue" path = /obj/item/clothing/suit/storage/toggle/lawyer/bluejacket /datum/gear/suit/purple_lawyer_jacket display_name = "suit jacket, purple" - path = /obj/item/clothing/suit/storage/lawyer/purpjacket + path = /obj/item/clothing/suit/storage/toggle/lawyer/purpjacket /datum/gear/suit/suspenders display_name = "suspenders" @@ -191,4 +195,14 @@ /datum/gear/suit/forensics/blue display_name = "forensics long, blue" path = /obj/item/clothing/suit/storage/forensics/blue/long + allowed_roles = list("Detective") + +/datum/gear/suit/forensics/blue/short + display_name = "forensics, blue" + path = /obj/item/clothing/suit/storage/forensics/blue + allowed_roles = list("Detective") + +/datum/gear/suit/forensics/red/short + display_name = "forensics, red" + path = /obj/item/clothing/suit/storage/forensics/red allowed_roles = list("Detective") \ No newline at end of file diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 2f2dad608b..7ed190db59 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -241,6 +241,12 @@ BLIND // can't see anything icon_state = "bigsunglasses" item_state = "bigsunglasses" +/obj/item/clothing/glasses/fakesunglasses //Sunglasses without flash immunity + desc = "A pair of designer sunglasses. Doesn't seem like it'll block flashes." + name = "stylish sunglasses" + icon_state = "sun" + item_state = "sunglasses" + /obj/item/clothing/glasses/sunglasses/sechud name = "HUDSunglasses" desc = "Sunglasses with a HUD." @@ -300,6 +306,8 @@ BLIND // can't see anything name = "Thermoncle" desc = "A monocle thermal." icon_state = "thermoncle" + toggleable = 1 + action_button_name = "Toggle Monocle" flags = null //doesn't protect eyes because it's a monocle, duh body_parts_covered = 0 @@ -310,6 +318,8 @@ BLIND // can't see anything icon_state = "eyepatch" item_state = "eyepatch" body_parts_covered = 0 + toggleable = 1 + action_button_name = "Toggle Eyepatch" /obj/item/clothing/glasses/thermal/plain/jensen name = "Optical Thermal Implants" diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 8b2e1fb477..3931b3ec67 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -146,7 +146,7 @@ //Lawyer /obj/item/clothing/suit/storage/toggle/lawyer/bluejacket - name = "Blue Suit Jacket" + name = "blue suit jacket" desc = "A snappy dress jacket." icon_state = "suitjacket_blue_open" item_state = "suitjacket_blue_open" @@ -155,17 +155,19 @@ blood_overlay_type = "coat" body_parts_covered = UPPER_TORSO|ARMS -/obj/item/clothing/suit/storage/lawyer/purpjacket - name = "Purple Suit Jacket" +/obj/item/clothing/suit/storage/toggle/lawyer/purpjacket + name = "purple suit jacket" desc = "A snappy dress jacket." - icon_state = "suitjacket_purp" - item_state = "suitjacket_purp" + icon_state = "suitjacket_purp_open" + item_state = "suitjacket_purp_open" + icon_open = "suitjacket_purp_open" + icon_closed = "suitjacket_purp" blood_overlay_type = "coat" body_parts_covered = UPPER_TORSO|ARMS //Internal Affairs /obj/item/clothing/suit/storage/toggle/internalaffairs - name = "Internal Affairs Jacket" + name = "black suit jacket" desc = "A smooth black jacket." icon_state = "ia_jacket_open" item_state = "ia_jacket" diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 7a66bd601c..025ea51b1f 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index fd52000ee4..fe58599efe 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ