diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index 8f2b224e4e1..71ec42dc2aa 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -118,6 +118,22 @@ ..() gear_tweaks = list(gear_tweak_free_color_choice) +/datum/gear/accessory/dressshirt + display_name = "dress shirt" + path = /obj/item/clothing/accessory/dressshirt + +/datum/gear/accessory/dressshirt/New() + ..() + gear_tweaks = list(gear_tweak_free_color_choice) + +/datum/gear/accessory/dressshirt_r + display_name = "dress shirt, rolled up" + path = /obj/item/clothing/accessory/dressshirt_r + +/datum/gear/accessory/dressshirt_r/New() + ..() + gear_tweaks = list(gear_tweak_free_color_choice) + /datum/gear/accessory/scarf display_name = "scarf selection" path = /obj/item/clothing/accessory/scarf diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index 8a80ea74d54..9398ad2f5c6 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -176,13 +176,13 @@ path = /obj/item/clothing/accessory/poncho/roles/cloak/security allowed_roles = list("Security Officer", "Warden", "Head of Security","Detective", "Forensic Technician", "Security Cadet") -/datum/gear/suit/blue_lawyer_jacket - display_name = "suit jacket, blue" - path = /obj/item/clothing/suit/storage/toggle/lawyer/bluejacket +/datum/gear/suit/suitjacket + display_name = "suit jacket" + path = /obj/item/clothing/suit/storage/toggle/suitjacket -/datum/gear/suit/purple_lawyer_jacket - display_name = "suit jacket, purple" - path = /obj/item/clothing/suit/storage/lawyer/purpjacket +/datum/gear/suit/suitjacket/New() + ..() + gear_tweaks = list(gear_tweak_free_color_choice) /datum/gear/suit/trenchcoat display_name = "trenchcoat, brown" diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 2f49c18d441..77bc493ce79 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -55,7 +55,6 @@ skirts["plaid skirt, red"] = /obj/item/clothing/under/skirt/plaid_red skirts["jumpskirt, black"] = /obj/item/clothing/under/skirt/blackjumpskirt skirts["skirt, black"] = /obj/item/clothing/under/skirt/ - skirts["skirt, khaki"] = /obj/item/clothing/under/skirt/khaki skirts["short skirt, black"] = /obj/item/clothing/under/skirt/short_black skirts["short skirt, blue"] = /obj/item/clothing/under/skirt/blue skirts["short skirt, red"] = /obj/item/clothing/under/skirt/red @@ -64,6 +63,22 @@ gear_tweaks += new/datum/gear_tweak/path(skirts) +/datum/gear/uniform/skirt/casual + display_name = "casual skirt" + path = /obj/item/clothing/under/skirt/casual + +/datum/gear/uniform/skirt/casual/New() + ..() + gear_tweaks = list(gear_tweak_free_color_choice) + +/datum/gear/uniform/skirt/long + display_name = "long skirt" + path = /obj/item/clothing/under/skirt/long + +/datum/gear/uniform/skirt/long/New() + ..() + gear_tweaks = list(gear_tweak_free_color_choice) + /datum/gear/uniform/suit display_name = "suit selection" path = /obj/item/clothing/under/lawyer/bluesuit diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 854fff0d5e7..00cd3654f1a 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -242,6 +242,7 @@ blood_overlay_type = "coat" body_parts_covered = UPPER_TORSO|ARMS + //Internal Affairs /obj/item/clothing/suit/storage/toggle/internalaffairs name = "internal affairs jacket" @@ -253,6 +254,18 @@ blood_overlay_type = "coat" body_parts_covered = UPPER_TORSO|ARMS +//Resprited from IAA jacket +/obj/item/clothing/suit/storage/toggle/suitjacket + name = "suit jacket" + desc = "A snappy dress jacket." + icon_state = "suitjacket_open" + item_state = "suitjacket_open" + icon_open = "suitjacket_open" + icon_closed = "suitjacket" + blood_overlay_type = "coat" + body_parts_covered = UPPER_TORSO|ARMS + + //Medical /obj/item/clothing/suit/storage/toggle/fr_jacket name = "first responder jacket" diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index e1726acaddf..54589fcfc17 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -271,6 +271,18 @@ icon_state = "sweater" item_state = "sweater" +/obj/item/clothing/accessory/dressshirt + name = "dress shirt" + desc = "A casual dress shirt." + icon_state = "dressshirt" + item_state = "dressshirt" + +/obj/item/clothing/accessory/dressshirt_r + name = "dress shirt" + desc = "A casual dress shirt. This one has its sleeves rolled up." + icon_state = "dressshirt_r" + item_state = "dressshirt_r" + /obj/item/clothing/accessory/scarf name = "white scarf" desc = "A simple scarf, to protect your neck from the cold of space." diff --git a/code/modules/clothing/under/skirts.dm b/code/modules/clothing/under/skirts.dm index add9784bd6c..85521ef69b0 100644 --- a/code/modules/clothing/under/skirts.dm +++ b/code/modules/clothing/under/skirts.dm @@ -15,6 +15,19 @@ icon_state = "skirt_khaki" worn_state = "skirt_khaki" +/obj/item/clothing/under/skirt/casual + name = "casual skirt" + desc = "A short, colorful skirt." + icon_state = "skirt_casual" + worn_state = "skirt_casual" + +/obj/item/clothing/under/skirt/long + name = "long skirt" + desc = "A long, modest skirt." + icon_state = "skirt_long" + worn_state = "skirt_long" + + /obj/item/clothing/under/skirt/short_black name = "short black skirt" desc = "A skirt that is a shiny black." diff --git a/html/changelogs/shedya - dressshirts.yml b/html/changelogs/shedya - dressshirts.yml new file mode 100644 index 00000000000..79dbc21e2fa --- /dev/null +++ b/html/changelogs/shedya - dressshirts.yml @@ -0,0 +1,40 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +################################# + +# Your name. +author: VTCobaltblood + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added dress shirts to loadout. Are an accessory, recolorable, significantly resprited from chef's uniform. Also added dress shirts with rolled up sleeves." + - rscadd: "Added a casual skirt and a long skirt to loadout. Both are recolorable." + - rscadd: "Added recolorable suit jackets to loadout, resprited from IAA suit jackets." + - tweak: "Removed items made obsolete by these additions (khaki skirt, blue/purple suit jacket) from loadout. They still can be spawned in." diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 391e23b9bd5..cd5b9e3aa73 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 05644aed11a..4777a2fd14a 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 6a3f70bbce7..ef40307fbc8 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index a461557b73b..be8594ea461 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 5ff4724d584..17e4cd17293 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 94a607e70f2..38615827e23 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ