diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index d2dc3e76cd..a58f3a450a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -187,85 +187,253 @@ whitelisted = "Tajara" /datum/gear/head/hijab - display_name = "Black hijab" + display_name = "hijab, black" path = /obj/item/clothing/head/hijab /datum/gear/head/hijab/white - display_name = "White hijab" + display_name = "hijab, white" path = /obj/item/clothing/head/hijab/white /datum/gear/head/hijab/aqua - display_name = "Aqua hijab" + display_name = "hijab, aqua" path = /obj/item/clothing/head/hijab/aqua /datum/gear/head/hijab/blue - display_name = "Blue hijab" + display_name = "hijab, blue" path = /obj/item/clothing/head/hijab/blue /datum/gear/head/hijab/brown - display_name = "Brown hijab" + display_name = "hijab, brown" path = /obj/item/clothing/head/hijab/brown /datum/gear/head/hijab/darkblue - display_name = "Dark blue hijab" + display_name = "hijab, dark blue" path = /obj/item/clothing/head/hijab/darkblue /datum/gear/head/hijab/darkred - display_name = "Dark red hijab" + display_name = "hijab, dark red" path = /obj/item/clothing/head/hijab/darkred /datum/gear/head/hijab/green - display_name = "Green hijab" + display_name = "hijab, green" path = /obj/item/clothing/head/hijab/green -/datum/gear/head/hijab/green - display_name = "Green hijab" +/datum/gear/head/hijab/grey + display_name = "hijab, grey" path = /obj/item/clothing/head/hijab/grey /datum/gear/head/hijab/lightblue - display_name = "Light blue hijab" + display_name = "hijab, light blue" path = /obj/item/clothing/head/hijab/lightblue /datum/gear/head/hijab/lightbrown - display_name = "Light brown hijab" + display_name = "hijab, light brown" path = /obj/item/clothing/head/hijab/lightbrown /datum/gear/head/hijab/lightgreen - display_name = "Light green hijab" + display_name = "hijab, light green" path = /obj/item/clothing/head/hijab/lightgreen /datum/gear/head/hijab/lightpurple - display_name = "Light purple hijab" + display_name = "hijab, light purple" path = /obj/item/clothing/head/hijab/lightpurple /datum/gear/head/hijab/lightred - display_name = "Light red hijab" + display_name = "hijab, light red" path = /obj/item/clothing/head/hijab/lightred /datum/gear/head/hijab/maroon - display_name = "Maroon hijab" + display_name = "hijab, maroon" path = /obj/item/clothing/head/hijab/maroon /datum/gear/head/hijab/orange - display_name = "Orange hijab" + display_name = "hijab, orange" path = /obj/item/clothing/head/hijab/orange /datum/gear/head/hijab/pink - display_name = "Pink hijab" + display_name = "hijab, pink" path = /obj/item/clothing/head/hijab/pink /datum/gear/head/hijab/purple - display_name = "Purple hijab" + display_name = "hijab, purple" path = /obj/item/clothing/head/hijab/purple /datum/gear/head/hijab/red - display_name = "Red hijab" + display_name = "hijab, red" path = /obj/item/clothing/head/hijab/red /datum/gear/head/hijab/yellowgreen - display_name = "Yellow green hijab" + display_name = "hijab, yellow green" path = /obj/item/clothing/head/hijab/yellowgreen /datum/gear/head/hijab/yellow - display_name = "Yellow hijab" + display_name = "hijab, yellow" path = /obj/item/clothing/head/hijab/yellow + +/datum/gear/head/kippa + display_name = "kippa, black" + path = /obj/item/clothing/head/kippa + +/datum/gear/head/kippa/white + display_name = "kippa, white" + path = /obj/item/clothing/head/kippa/white + +/datum/gear/head/kippa/aqua + display_name = "kippa, aqua" + path = /obj/item/clothing/head/kippa/aqua + +/datum/gear/head/kippa/blue + display_name = "kippa, blue" + path = /obj/item/clothing/head/kippa/blue + +/datum/gear/head/kippa/brown + display_name = "kippa, brown" + path = /obj/item/clothing/head/kippa/brown + +/datum/gear/head/kippa/darkblue + display_name = "kippa, dark blue" + path = /obj/item/clothing/head/kippa/darkblue + +/datum/gear/head/kippa/darkred + display_name = "kippa, dark red" + path = /obj/item/clothing/head/kippa/darkred + +/datum/gear/head/kippa/green + display_name = "kippa, green" + path = /obj/item/clothing/head/kippa/green + +/datum/gear/head/kippa/grey + display_name = "kippa, grey" + path = /obj/item/clothing/head/kippa/grey + +/datum/gear/head/kippa/lightblue + display_name = "kippa, light blue" + path = /obj/item/clothing/head/kippa/lightblue + +/datum/gear/head/kippa/lightbrown + display_name = "kippa, light brown" + path = /obj/item/clothing/head/kippa/lightbrown + +/datum/gear/head/kippa/lightgreen + display_name = "kippa, light green" + path = /obj/item/clothing/head/kippa/lightgreen + +/datum/gear/head/kippa/lightpurple + display_name = "kippa, light purple" + path = /obj/item/clothing/head/kippa/lightpurple + +/datum/gear/head/kippa/lightred + display_name = "kippa, light red" + path = /obj/item/clothing/head/kippa/lightred + +/datum/gear/head/kippa/maroon + display_name = "kippa, maroon" + path = /obj/item/clothing/head/kippa/maroon + +/datum/gear/head/kippa/orange + display_name = "kippa, orange" + path = /obj/item/clothing/head/kippa/orange + +/datum/gear/head/kippa/pink + display_name = "kippa, pink" + path = /obj/item/clothing/head/kippa/pink + +/datum/gear/head/kippa/purple + display_name = "kippa, purple" + path = /obj/item/clothing/head/kippa/purple + +/datum/gear/head/kippa/red + display_name = "kippa, red" + path = /obj/item/clothing/head/kippa/red + +/datum/gear/head/kippa/yellowgreen + display_name = "kippa, yellow green" + path = /obj/item/clothing/head/kippa/yellowgreen + +/datum/gear/head/kippa/yellow + display_name = "kippa, yellow" + path = /obj/item/clothing/head/kippa/yellow + +/datum/gear/head/turban + display_name = "turban, black" + path = /obj/item/clothing/head/turban + +/datum/gear/head/turban/white + display_name = "turban, white" + path = /obj/item/clothing/head/turban/white + +/datum/gear/head/turban/aqua + display_name = "turban, aqua" + path = /obj/item/clothing/head/turban/aqua + +/datum/gear/head/turban/blue + display_name = "turban, blue" + path = /obj/item/clothing/head/turban/blue + +/datum/gear/head/turban/brown + display_name = "turban, brown" + path = /obj/item/clothing/head/turban/brown + +/datum/gear/head/turban/darkblue + display_name = "turban, dark blue" + path = /obj/item/clothing/head/turban/darkblue + +/datum/gear/head/turban/darkred + display_name = "turban, dark red" + path = /obj/item/clothing/head/turban/darkred + +/datum/gear/head/turban/green + display_name = "turban, green" + path = /obj/item/clothing/head/turban/green + +/datum/gear/head/turban/grey + display_name = "turban, grey" + path = /obj/item/clothing/head/turban/grey + +/datum/gear/head/turban/lightblue + display_name = "turban, light blue" + path = /obj/item/clothing/head/turban/lightblue + +/datum/gear/head/turban/lightbrown + display_name = "turban, light brown" + path = /obj/item/clothing/head/turban/lightbrown + +/datum/gear/head/turban/lightgreen + display_name = "turban, light green" + path = /obj/item/clothing/head/turban/lightgreen + +/datum/gear/head/turban/lightpurple + display_name = "turban, light purple" + path = /obj/item/clothing/head/turban/lightpurple + +/datum/gear/head/turban/lightred + display_name = "turban, light red" + path = /obj/item/clothing/head/turban/lightred + +/datum/gear/head/turban/maroon + display_name = "turban, maroon" + path = /obj/item/clothing/head/turban/maroon + +/datum/gear/head/turban/orange + display_name = "turban, orange" + path = /obj/item/clothing/head/turban/orange + +/datum/gear/head/turban/pink + display_name = "turban, pink" + path = /obj/item/clothing/head/turban/pink + +/datum/gear/head/turban/purple + display_name = "turban, purple" + path = /obj/item/clothing/head/turban/purple + +/datum/gear/head/turban/red + display_name = "turban, red" + path = /obj/item/clothing/head/turban/red + +/datum/gear/head/turban/yellowgreen + display_name = "turban, yellow green" + path = /obj/item/clothing/head/turban/yellowgreen + +/datum/gear/head/turban/yellow + display_name = "turban, yellow" + path = /obj/item/clothing/head/turban/yellow \ 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 6d9a253398..542fe34ae0 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -98,6 +98,10 @@ display_name = "hoodie, NT" path = /obj/item/clothing/suit/storage/toggle/hoodie/nt +/datum/gear/suit/hoodie/smw + display_name = "hoodie, Space Mountain Wind" + path = /obj/item/clothing/suit/storage/toggle/hoodie/smw + /datum/gear/suit/labcoat display_name = "labcoat" path = /obj/item/clothing/suit/storage/toggle/labcoat diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index c47c1e8878..17c7cd0666 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -380,4 +380,222 @@ /obj/item/clothing/head/hijab/yellow name = "yellow hijab" desc = "A yellow veil that is wrapped to cover the head and chest" - icon_state = "hijab_yellow" \ No newline at end of file + icon_state = "hijab_yellow" + +//Kippot + +/obj/item/clothing/head/kippa + name = "black kippa" + desc = "A small, brimless cap. It is black." + icon_state = "kippa_black" + body_parts_covered = 0 + +/obj/item/clothing/head/kippa/aqua + name = "aqua kippa" + desc = "A small, brimless cap. It is aqua." + icon_state = "kippa_aqua" + +/obj/item/clothing/head/kippa/blue + name = "blue kippa" + desc = "A small, brimless cap. It is blue." + icon_state = "kippa_blue" + +/obj/item/clothing/head/kippa/brown + name = "brown kippa" + desc = "A small, brimless cap. It is blue." + icon_state = "kippa_brown" + +/obj/item/clothing/head/kippa/darkblue + name = "dark blue kippa" + desc = "A small, brimless cap. It is dark blue." + icon_state = "kippa_darkblue" + +/obj/item/clothing/head/kippa/darkred + name = "dark red kippa" + desc = "A small, brimless cap. It is dark red." + icon_state = "kippa_darkred" + +/obj/item/clothing/head/kippa/green + name = "green kippa" + desc = "A small, brimless cap. It is green." + icon_state = "kippa_green" + +/obj/item/clothing/head/kippa/grey + name = "grey kippa" + desc = "A small, brimless cap. It is grey." + icon_state = "kippa_grey" + +/obj/item/clothing/head/kippa/lightblue + name = "light blue kippa" + desc = "A small, brimless cap. It is light blue." + icon_state = "kippa_lightblue" + +/obj/item/clothing/head/kippa/lightbrown + name = "light brown kippa" + desc = "A small, brimless cap. It is light brown." + icon_state = "kippa_lightbrown" + +/obj/item/clothing/head/kippa/lightgreen + name = "light green kippa" + desc = "A small, brimless cap. It is light green." + icon_state = "kippa_lightgreen" + +/obj/item/clothing/head/kippa/lightpurple + name = "light purple kippa" + desc = "A small, brimless cap. It is light purple." + icon_state = "kippa_lightpurple" + +/obj/item/clothing/head/kippa/lightred + name = "light red kippa" + desc = "A small, brimless cap. It is light red." + icon_state = "kippa_lightred" + +/obj/item/clothing/head/kippa/maroon + name = "maroon kippa" + desc = "A small, brimless cap. It is maroon." + icon_state = "kippa_maroon" + +/obj/item/clothing/head/kippa/orange + name = "orange kippa" + desc = "A small, brimless cap. It is orange." + icon_state = "kippa_orange" + +/obj/item/clothing/head/kippa/pink + name = "pink kippa" + desc = "A small, brimless cap. It is pink." + icon_state = "kippa_pink" + +/obj/item/clothing/head/kippa/purple + name = "purple kippa" + desc = "A small, brimless cap. It is purple." + icon_state = "kippa_purple" + +/obj/item/clothing/head/kippa/red + name = "red kippa" + desc = "A small, brimless cap. It is red." + icon_state = "kippa_red" + +/obj/item/clothing/head/kippa/white + name = "white kippa" + desc = "A small, brimless cap. It is white." + icon_state = "kippa_white" + +/obj/item/clothing/head/kippa/yellowgreen + name = "yellow green kippa" + desc = "A small, brimless cap. It is yellow green." + icon_state = "kippa_yellowgreen" + +/obj/item/clothing/head/kippa/yellow + name = "yellow kippa" + desc = "A small, brimless cap. It is yellow." + icon_state = "kippa_yellow" + +//Turbans + +/obj/item/clothing/head/turban + name = "black turban" + desc = "A black cloth used to wind around the head" + icon_state = "turban_black" + body_parts_covered = 0 + flags_inv = BLOCKHAIR + +/obj/item/clothing/head/turban/aqua + name = "aqua turban" + desc = "An aqua cloth used to wind around the head." + icon_state = "turban_aqua" + +/obj/item/clothing/head/turban/blue + name = "blue turban" + desc = "A blue cloth used to wind around the head." + icon_state = "turban_blue" + +/obj/item/clothing/head/turban/brown + name = "brown turban" + desc = "A brown cloth used to wind around the head." + icon_state = "turban_brown" + +/obj/item/clothing/head/turban/darkblue + name = "dark blue turban" + desc = "A dark blue cloth used to wind around the head." + icon_state = "turban_darkblue" + +/obj/item/clothing/head/turban/darkred + name = "dark red turban" + desc = "A dark red cloth used to wind around the head." + icon_state = "turban_darkred" + +/obj/item/clothing/head/turban/green + name = "green turban" + desc = "A green cloth used to wind around the head." + icon_state = "turban_green" + +/obj/item/clothing/head/turban/grey + name = "grey turban" + desc = "A grey cloth used to wind around the head." + icon_state = "turban_grey" + +/obj/item/clothing/head/turban/lightblue + name = "light blue turban" + desc = "A light blue cloth used to wind around the head." + icon_state = "turban_lightblue" + +/obj/item/clothing/head/turban/lightbrown + name = "light brown turban" + desc = "A light brown cloth used to wind around the head." + icon_state = "turban_lightbrown" + +/obj/item/clothing/head/turban/lightgreen + name = "light green turban" + desc = "A light green cloth used to wind around the head." + icon_state = "turban_lightgreen" + +/obj/item/clothing/head/turban/lightpurple + name = "light purple turban" + desc = "A light purple cloth used to wind around the head." + icon_state = "turban_lightpurple" + +/obj/item/clothing/head/turban/lightred + name = "light red turban" + desc = "A light red cloth used to wind around the head." + icon_state = "turban_lightred" + +/obj/item/clothing/head/turban/maroon + name = "maroon turban" + desc = "A maroon cloth used to wind around the head." + icon_state = "turban_maroon" + +/obj/item/clothing/head/turban/orange + name = "orange turban" + desc = "An orange cloth used to wind around the head." + icon_state = "turban_orange" + +/obj/item/clothing/head/turban/pink + name = "pink turban" + desc = "A pink cloth used to wind around the head." + icon_state = "turban_pink" + +/obj/item/clothing/head/turban/purple + name = "purple turban" + desc = "A purple cloth used to wind around the head." + icon_state = "turban_purple" + +/obj/item/clothing/head/turban/red + name = "red turban" + desc = "A red cloth used to wind around the head." + icon_state = "turban_red" + +/obj/item/clothing/head/turban/white + name = "white turban" + desc = "A white cloth used to wind around the head." + icon_state = "turban_white" + +/obj/item/clothing/head/turban/yellowgreen + name = "yellow green turban" + desc = "A yellow green cloth used to wind around the head." + icon_state = "turban_yellowgreen" + +/obj/item/clothing/head/turban/yellow + name = "yellow turban" + desc = "A yellow cloth used to wind around the head." + icon_state = "turban_yellow" + diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 4a1a0c72eb..6203ce119e 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -502,6 +502,14 @@ icon_open = "nt_hoodie_open" icon_closed = "nt_hoodie" +/obj/item/clothing/suit/storage/toggle/hoodie/smw + name = "Space Mountain Wind hoodie" + desc = "A warm, black sweatshirt. It has the logo for the popular softdrink Space Mountain Wind on both the front and the back." + icon_state = "smw_hoodie" + item_state = "smw_hoodie" + icon_open = "smw_hoodie_open" + icon_closed = "smw_hoodie" + // FUN! /obj/item/clothing/suit/whitedress diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index f70769ef0d..e67cfe404f 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 477469bbf9..506e73838c 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index cb8dc153e3..b9ad0bd343 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 4dba3c2f8d..79483c1422 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ