diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index 98661cb6498..503c55a684f 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -111,3 +111,19 @@ /datum/gear/head/ushanka display_name = "ushanka" path = /obj/item/clothing/head/ushanka + +/datum/gear/head/hijab + display_name = "hijab selection" + path = /obj/item/clothing/head/hijab + +/datum/gear/head/hijab/New() + ..() + var/hijab = list() + hijab["black hijab"] = /obj/item/clothing/head/hijab + hijab["grey hijab"] = /obj/item/clothing/head/hijab/grey + hijab["red hijab"] = /obj/item/clothing/head/hijab/red + hijab["brown hijab"] = /obj/item/clothing/head/hijab/brown + hijab["green hijab"] = /obj/item/clothing/head/hijab/green + hijab["blue hijab"] = /obj/item/clothing/head/hijab/blue + + gear_tweaks += new/datum/gear_tweak/path(hijab) diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno.dm b/code/modules/client/preference_setup/loadout/loadout_xeno.dm index 30046c13dd3..135c22be02b 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno.dm @@ -14,6 +14,13 @@ whitelisted = "Unathi" sort_category = "Xenowear" +/datum/gear/suit/robe_coat + display_name = "tzirzi robe (Unathi)" + path = /obj/item/clothing/suit/unathi/robe/robe_coat + cost = 1 + whitelisted = "Unathi" + sort_category = "Xenowear" + //skrell headtail adorns /datum/gear/ears/f_skrell @@ -67,7 +74,7 @@ cost = 1 whitelisted = "Vaurca" sort_category = "Xenowear" - + /datum/gear/cape display_name = "tunnel cloak (Vaurca)" path = /obj/item/weapon/storage/backpack/cloak diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index abae29b0889..045af3d30fd 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -250,3 +250,43 @@ desc = "An orange piece of cloth, worn on the head." icon_state = "orange_bandana" body_parts_covered = 0 + +/obj/item/clothing/head/hijab //It might've taken a year but here's your Hijab's, Dea. + name = "hijab" + desc = "Encompassing cloth headwear worn by some human cultures and religions." + icon = 'icons/obj/clothing/hijabs.dmi' + icon_state = "hijab_black" + item_state = "hijab_black" + flags_inv = BLOCKHAIR + body_parts_covered = 0 + contained_sprite = 1 + +/obj/item/clothing/head/hijab/grey + name = "grey hijab" + icon = 'icons/obj/clothing/hijabs.dmi' + icon_state = "hijab_grey" + item_state = "hijab_grey" + +/obj/item/clothing/head/hijab/red + name = "red hijab" + icon = 'icons/obj/clothing/hijabs.dmi' + icon_state = "hijab_red" + item_state = "hijab_red" + +/obj/item/clothing/head/hijab/brown + name = "brown hijab" + icon = 'icons/obj/clothing/hijabs.dmi' + icon_state = "hijab_brown" + item_state = "hijab_brown" + +/obj/item/clothing/head/hijab/green + name = "green hijab" + icon = 'icons/obj/clothing/hijabs.dmi' + icon_state = "hijab_green" + item_state = "hijab_green" + +/obj/item/clothing/head/hijab/blue + name = "blue hijab" + icon = 'icons/obj/clothing/hijabs.dmi' + icon_state = "hijab_blue" + item_state = "hijab_blue" \ No newline at end of file diff --git a/code/modules/clothing/suits/alien.dm b/code/modules/clothing/suits/alien.dm index 54141e99948..e10e873888e 100644 --- a/code/modules/clothing/suits/alien.dm +++ b/code/modules/clothing/suits/alien.dm @@ -7,6 +7,15 @@ item_state = "robe-unathi" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS +/obj/item/clothing/suit/unathi/robe/robe_coat //I was at a loss for names under-the-hood. + name = "tzirzi" + desc = "A casual Moghes-native garment typically worn by Unathi while planet-side." + icon = 'icons/obj/clothing/robe_coat.dmi' + icon_state = "robe_coat" + item_state = "robe_coat" + body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS + contained_sprite = 1 + /obj/item/clothing/suit/unathi/mantle name = "hide mantle" desc = "A rather grisly selection of cured hides and skin, sewn together to form a ragged mantle." diff --git a/html/changelogs/Fire and Glory-Fire-and-Glory-dev1.yml b/html/changelogs/Fire and Glory-Fire-and-Glory-dev1.yml new file mode 100644 index 00000000000..ac5517ad648 --- /dev/null +++ b/html/changelogs/Fire and Glory-Fire-and-Glory-dev1.yml @@ -0,0 +1,38 @@ +################################ +# 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 +################################# + +# Your name. +author: Fire and Glory + +# 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 Hijab's, obtainable in the heads section of custom loadout." + - rscadd: "Added a variant of the Unathi robe, obtainable in the xeno section of custom loadout (for Unathi)." + - imageadd: "Added different sprites for Ninja Tajara, Unathi, and Skrell." \ No newline at end of file diff --git a/icons/mob/species/skrell/helmet.dmi b/icons/mob/species/skrell/helmet.dmi index 912d5532911..edbfbca7f26 100644 Binary files a/icons/mob/species/skrell/helmet.dmi and b/icons/mob/species/skrell/helmet.dmi differ diff --git a/icons/mob/species/tajaran/helmet.dmi b/icons/mob/species/tajaran/helmet.dmi index 9ef312f8f9c..1db31505771 100644 Binary files a/icons/mob/species/tajaran/helmet.dmi and b/icons/mob/species/tajaran/helmet.dmi differ diff --git a/icons/mob/species/tajaran/suit.dmi b/icons/mob/species/tajaran/suit.dmi index 0e5a7e46a89..d6526c204c4 100644 Binary files a/icons/mob/species/tajaran/suit.dmi and b/icons/mob/species/tajaran/suit.dmi differ diff --git a/icons/mob/species/unathi/helmet.dmi b/icons/mob/species/unathi/helmet.dmi index 0711bb8f54b..fb13f01834a 100644 Binary files a/icons/mob/species/unathi/helmet.dmi and b/icons/mob/species/unathi/helmet.dmi differ diff --git a/icons/mob/species/unathi/suit.dmi b/icons/mob/species/unathi/suit.dmi index 16d5c68bb2f..6273ab7575b 100644 Binary files a/icons/mob/species/unathi/suit.dmi and b/icons/mob/species/unathi/suit.dmi differ diff --git a/icons/obj/clothing/hijabs.dmi b/icons/obj/clothing/hijabs.dmi new file mode 100644 index 00000000000..52220d1a2e0 Binary files /dev/null and b/icons/obj/clothing/hijabs.dmi differ diff --git a/icons/obj/clothing/robe_coat.dmi b/icons/obj/clothing/robe_coat.dmi new file mode 100644 index 00000000000..0b996cfc6bd Binary files /dev/null and b/icons/obj/clothing/robe_coat.dmi differ