diff --git a/code/modules/client/preference_setup/loadout/loadout_shoes.dm b/code/modules/client/preference_setup/loadout/loadout_shoes.dm index 71ea8011ef3..f5af4e4bb84 100644 --- a/code/modules/client/preference_setup/loadout/loadout_shoes.dm +++ b/code/modules/client/preference_setup/loadout/loadout_shoes.dm @@ -54,4 +54,32 @@ shoes["dress flats, blue"] = /obj/item/clothing/shoes/flats/blue shoes["dress flats, green"] = /obj/item/clothing/shoes/flats/green shoes["dress flats, purple"] = /obj/item/clothing/shoes/flats/purple - gear_tweaks += new/datum/gear_tweak/path(shoes) \ No newline at end of file + gear_tweaks += new/datum/gear_tweak/path(shoes) + +/datum/gear/shoes/cowboy + display_name = "cowboy boots selection" + path = /obj/item/clothing/shoes/cowboy + +/datum/gear/shoes/cowboy/New() + ..() + var/shoes = list() + shoes["cowboy boots"] = /obj/item/clothing/shoes/cowboy + shoes["classic cowboy boots"] = /obj/item/clothing/shoes/cowboy/classic + shoes["snakeskin cowboy boots"] = /obj/item/clothing/shoes/cowboy/snakeskin + gear_tweaks += new/datum/gear_tweak/path(shoes) + +/datum/gear/shoes/heels + display_name = "high heels" + path = /obj/item/clothing/shoes/heels + +/datum/gear/shoes/heels/New() + ..() + gear_tweaks = list(gear_tweak_free_color_choice) + +/datum/gear/shoes/tongs + display_name = "flip flops" + path = /obj/item/clothing/shoes/sandal/flipflop + +/datum/gear/shoes/tongs/New() + ..() + gear_tweaks = list(gear_tweak_free_color_choice) \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index 8b003bdb385..883e46cd5f7 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -176,4 +176,18 @@ /datum/gear/suit/secjackethos display_name = "navy security jacket (Head of Security)" path = /obj/item/clothing/suit/security/navyhos - allowed_roles = list("Head of Security") \ No newline at end of file + allowed_roles = list("Head of Security") + +/datum/gear/suit/dominia + display_name = "dominia great coat selection" + path = /obj/item/clothing/suit/storage/toggle/dominia + +/datum/gear/suit/dominia/New() + ..() + var/coat = list() + coat["dominia great coat"] = /obj/item/clothing/suit/storage/toggle/dominia + coat["dominia great coat, alternative"] = /obj/item/clothing/suit/storage/toggle/dominia/alt + coat["dominia cape"] = /obj/item/clothing/suit/storage/dominia + coat["dominia great coat, black"] = /obj/item/clothing/suit/storage/toggle/dominia/black + coat["dominia great coat, alternative black"] = /obj/item/clothing/suit/storage/toggle/dominia/black/alt + gear_tweaks += new/datum/gear_tweak/path(coat) \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 06a04cfa820..d903500f7cb 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -200,3 +200,14 @@ display_name = "tacticool turtleneck" path = /obj/item/clothing/under/syndicate/tacticool +/datum/gear/uniform/dominia + display_name = "dominia suit selection" + path = /obj/item/clothing/under/dominia + +/datum/gear/uniform/dominia/New() + ..() + var/suit = list() + suit["dominia suit"] = /obj/item/clothing/under/dominia + suit["dominia suit, black"] = /obj/item/clothing/under/dominia/black + suit["lyodsuit"] = /obj/item/clothing/under/dom_thermal + gear_tweaks += new/datum/gear_tweak/path(suit) \ No newline at end of file diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index 29b7250fcfd..e43946bd4e2 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -54,6 +54,11 @@ icon_state = "black" body_parts_covered = FEET +/obj/item/clothing/shoes/sandal/flipflop + name = "flip flops" + desc = "A pair of foam flip flops. For those not afraid to show a little ankle." + icon_state = "thongsandal" + /obj/item/clothing/shoes/clown_shoes desc = "The prankster's standard-issue clowning shoes. Damn they're huge!" name = "clown shoes" @@ -140,4 +145,24 @@ cold_protection = FEET|LEGS min_cold_protection_temperature = SHOE_MIN_COLD_PROTECTION_TEMPERATURE heat_protection = FEET|LEGS - max_heat_protection_temperature = SHOE_MAX_HEAT_PROTECTION_TEMPERATURE \ No newline at end of file + max_heat_protection_temperature = SHOE_MAX_HEAT_PROTECTION_TEMPERATURE + +/obj/item/clothing/shoes/cowboy + name = "cowboy boots" + desc = "Lacking a durasteel horse to ride." + icon_state = "cowboy" + +/obj/item/clothing/shoes/cowboy/classic + name = "classic cowboy boots" + desc = "A classic looking pair of durable cowboy boots." + icon_state = "cowboy_classic" + +/obj/item/clothing/shoes/cowboy/snakeskin + name = "snakeskin cowboy boots" + desc = "A pair of cowboy boots made from python skin." + icon_state = "cowboy_snakeskin" + +/obj/item/clothing/shoes/heels + name = "high heels" + desc = "A pair of high-heeled shoes. Fancy!" + icon_state = "heels" \ No newline at end of file diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 96de3517e02..dc9cc99bb81 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -397,4 +397,36 @@ item_state = "trench2" icon_open = "trench2_open" icon_closed = "trench2" - blood_overlay_type = "coat" \ No newline at end of file + blood_overlay_type = "coat" + +/obj/item/clothing/suit/storage/dominia + name = "dominia cape" + desc = "This is a cape in the style of Dominia nobility. It's the latest fashion across Dominian space." + icon_state = "dominian_cape" + item_state = "dominian_cape" + +/obj/item/clothing/suit/storage/toggle/dominia + name = "dominia great coat" + desc = "This is a great coat in the style of Dominia nobility. It's the latest fashion across Dominian space." + icon_state = "dominian_noble" + item_state = "dominian_noble" + icon_open = "dominian_noble_open" + icon_closed = "dominian_noble" + +/obj/item/clothing/suit/storage/toggle/dominia/alt + icon_state = "dominian_noble2" + item_state = "dominian_noble2" + icon_open = "dominian_noble2_open" + icon_closed = "dominian_noble2" + +/obj/item/clothing/suit/storage/toggle/dominia/black + icon_state = "dominian_noble4" + item_state = "dominian_noble4" + icon_open = "dominian_noble4_open" + icon_closed = "dominian_noble4" + +/obj/item/clothing/suit/storage/toggle/dominia/black/alt + icon_state = "dominian_noble5" + item_state = "dominian_noble5" + icon_open = "dominian_noble5_open" + icon_closed = "dominian_noble5" \ No newline at end of file diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 3976b5ede5c..f0150a1148e 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -537,7 +537,19 @@ item_state = "blue_blazer" worn_state = "blue_blazer" +/obj/item/clothing/under/dominia + name = "dominia suit" + desc = "This is a suit in the style of Dominia nobility. It's the latest fashion across Dominian space." + icon_state = "domsuit" +/obj/item/clothing/under/dominia/black + icon_state = "domsuit2" + +/obj/item/clothing/under/dom_thermal + name = "lyodsuit" + desc = "An imitation Lyodsuit from Dominia. Though it is not able to protect against extreme cold like a true lyodsuit it's lightweight and high quality fabric make it extremely comfortable to wear. \ + Fashionable amongst the middle and lower classes of Dominia" + icon_state = "dom_thermal" //stripper /obj/item/clothing/under/stripper diff --git a/html/changelogs/alberyk-fashion.dml b/html/changelogs/alberyk-fashion.dml new file mode 100644 index 00000000000..5e8fbdb028e --- /dev/null +++ b/html/changelogs/alberyk-fashion.dml @@ -0,0 +1,5 @@ +author: Alberyk +delete-after: True + +changes: + - rscadd: "Added new fashion options to the custom loadout.." diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi index 84574c6497c..b23e407f261 100644 Binary files a/icons/mob/feet.dmi and b/icons/mob/feet.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index fb114a10610..73a6ca3a4a8 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 c5017f40f4f..5fbb092d3aa 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi index 3f82e8d0f94..686bf49be14 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 0f024f1b025..3727d1b4c9b 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 4c6f944ea54..df71b02bf7c 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ