diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index 840d91e7b92..92001e13e7c 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -51,6 +51,15 @@ ties["blue tie"] = /obj/item/clothing/accessory/blue ties["red tie"] = /obj/item/clothing/accessory/red ties["horrible tie"] = /obj/item/clothing/accessory/horrible + ties["blue tie with a clip"] = /obj/item/clothing/accessory/tie/blue_clip + ties["blue long tie"] = /obj/item/clothing/accessory/tie/blue_long + ties["red tie with a clip"] = /obj/item/clothing/accessory/tie/red_clip + ties["red long tie"] = /obj/item/clothing/accessory/tie/red_long + ties["black tie"] = /obj/item/clothing/accessory/tie/black + ties["dark green tie"] = /obj/item/clothing/accessory/tie/darkgreen + ties["yellow tie"] = /obj/item/clothing/accessory/tie/yellow + ties["navy tie"] = /obj/item/clothing/accessory/tie/navy + ties["white tie"] = /obj/item/clothing/accessory/tie/white gear_tweaks += new/datum/gear_tweak/path(ties) /datum/gear/accessory/brown_vest @@ -97,6 +106,18 @@ display_name = "silver locket" path = /obj/item/clothing/accessory/locket +/datum/gear/accessory/locket + display_name = "silver locket" + path = /obj/item/clothing/accessory/locket + +/datum/gear/accessory/sweater + display_name = "sweater" + path = /obj/item/clothing/accessory/sweater + +/datum/gear/accessory/sweater/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_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index a401a8ec5e3..e3af9f70d98 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -174,11 +174,3 @@ display_name = "tacticool turtleneck" path = /obj/item/clothing/under/syndicate/tacticool - -/datum/gear/uniform/sweater - display_name = "sweater" - path = /obj/item/clothing/under/sweater - -/datum/gear/uniform/sweater/New() - ..() - gear_tweaks = list(gear_tweak_free_color_choice) \ No newline at end of file diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 74f8a8c7b2e..4b2dc148de8 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -91,6 +91,42 @@ desc = "A neosilk clip-on tie. This one is disgusting." icon_state = "horribletie" +/obj/item/clothing/accessory/tie/blue_clip + name = "blue tie with a clip" + icon_state = "bluecliptie" + +/obj/item/clothing/accessory/tie/blue_long + name = "blue long tie" + icon_state = "bluelongtie" + +/obj/item/clothing/accessory/tie/red_clip + name = "red tie with a clip" + icon_state = "redcliptie" + +/obj/item/clothing/accessory/tie/red_long + name = "red long tie" + icon_state = "redlongtie" + +/obj/item/clothing/accessory/tie/black + name = "black tie" + icon_state = "blacktie" + +/obj/item/clothing/accessory/tie/darkgreen + name = "dark green tie" + icon_state = "dgreentie" + +/obj/item/clothing/accessory/tie/yellow + name = "yellow tie" + icon_state = "yellowtie" + +/obj/item/clothing/accessory/tie/navy + name = "navy tie" + icon_state = "navytie" + +/obj/item/clothing/accessory/tie/white + name = "white tie" + icon_state = "whitetie" + /obj/item/clothing/accessory/stethoscope name = "stethoscope" desc = "An outdated medical apparatus for listening to the sounds of the human body. It also makes you look like you know what you're doing." @@ -154,7 +190,7 @@ desc = "A bronze medal." icon_state = "bronze" item_state = "bronze" - + /obj/item/clothing/accessory/medal/conduct name = "distinguished conduct medal" desc = "A bronze medal awarded for distinguished conduct. Whilst a great honor, this is most basic award on offer. It is often awarded by a captain to a member of their crew." @@ -225,52 +261,58 @@ icon_state = "suspenders" item_state = "suspenders" +/obj/item/clothing/accessory/sweater + name = "sweater" + desc = "A warm knit sweater." + icon_state = "sweater" + item_state = "sweater" + /obj/item/clothing/accessory/scarf name = "white scarf" desc = "A simple scarf, to protect your neck from the cold of space." icon_state = "whitescarf" item_state = "whitescarf" - + /obj/item/clothing/accessory/scarf/yellow name = "yellow scarf" icon_state = "yellowscarf" item_state = "yellowscarf" - + /obj/item/clothing/accessory/scarf/green name = "green scarf" icon_state = "greenscarf" item_state = "greenscarf" - + /obj/item/clothing/accessory/scarf/purple name = "purple scarf" icon_state = "purplescarf" item_state = "purplescarf" - + /obj/item/clothing/accessory/scarf/black name = "black scarf" icon_state = "blackscarf" item_state = "blackscarf" - + /obj/item/clothing/accessory/scarf/red name = "red scarf" icon_state = "redscarf" item_state = "redscarf" - + /obj/item/clothing/accessory/scarf/orange name = "orange scarf" icon_state = "orangescarf" item_state = "orangescarf" - + /obj/item/clothing/accessory/scarf/light_blue name = "light blue scarf" icon_state = "lightbluescarf" item_state = "lightbluescarf" - + /obj/item/clothing/accessory/scarf/dark_blue name = "dark blue scarf" icon_state = "darkbluescarf" item_state = "darkbluescarf" - + /obj/item/clothing/accessory/scarf/zebra name = "zebra scarf" icon_state = "zebrascarf" diff --git a/html/changelogs/alberyk-moreclothes.yml b/html/changelogs/alberyk-moreclothes.yml new file mode 100644 index 00000000000..a140ec31572 --- /dev/null +++ b/html/changelogs/alberyk-moreclothes.yml @@ -0,0 +1,5 @@ +author: Alberyk +delete-after: True + +changes: + - rscadd: "Added new accessory related options to the loadout, such as ties." diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index f93de3b289f..3408355e1ce 100644 Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi index 0daa74fcb4c..c457293b6d5 100644 Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ