Adds colorable hijabs, colorable neck bandannas, lipstick, and Dominian Great House standards. (#11433)

code/game/objects/items/weapons/cosmetics.dm

@@ -23,15 +23,67 @@
 	name = "black lipstick"
 	colour = "black"
 
+/obj/item/lipstick/amberred
+	name = "amberred lipstick"
+	colour = "amberred"
+
+/obj/item/lipstick/cherry
+	name = "cherry lipstick"
+	colour = "cherry"
+
+/obj/item/lipstick/orange
+	name = "orange lipstick"
+	colour = "orange"
+
+/obj/item/lipstick/gold
+	name = "gold lipstick"
+	colour = "gold"
+
+/obj/item/lipstick/purple
+	name = "purple lipstick"
+	colour = "purple"
+
+/obj/item/lipstick/deepred
+	name = "deepred lipstick"
+	colour = "deepred"
+
 /obj/item/lipstick/pink
 	name = "pink lipstick"
 	colour = "pink"
 
+/obj/item/lipstick/rosepink
+	name = "rosepink lipstick"
+	colour = "rosepink"
+
+/obj/item/lipstick/nude
+	name = "nude lipstick"
+	colour = "nude"
+
+/obj/item/lipstick/wine
+	name = "wine lipstick"
+	colour = "wine"
+
+/obj/item/lipstick/peach
+	name = "peach lipstick"
+	colour = "peach"
+
+/obj/item/lipstick/forestgreen
+	name = "forestgreen lipstick"
+	colour = "forestgreen"
+
+/obj/item/lipstick/skyblue
+	name = "skyblue lipstick"
+	colour = "skyblue"
+
+/obj/item/lipstick/teal
+	name = "teal lipstick"
+	colour = "teal"
+
 /obj/item/lipstick/random
 	name = "lipstick"
 
 /obj/item/lipstick/random/New()
-	colour = pick("red","purple","jade","pink","black")
+	colour = pick("red","purple","jade","black","amberred","cherry","orange","gold","purple","deepred","pink","rosepink","nude","wine","peach","forestgreen","skyblue","teal")
 	name = "[colour] lipstick"
 
 

code/game/objects/structures/signs.dm

@@ -698,6 +698,65 @@
 	desc = "A green Dominian standard which represents the dionae within the Empire."
 	icon_state = "diona"
 
+/obj/item/flag/strelitz
+	name = "House Strelitz standard"
+	desc = "A red-and-dark standard with a gold trim that represents House Strelitz, one of the great houses of the Empire of Dominia. \
+	They are known for their military service and emphasis on personal bravery."
+	flag_path = "strelitz"
+
+/obj/structure/sign/flag/strelitz
+	name = "House Strelitz standard"
+	desc = "A red-and-dark standard with a gold trim that represents House Strelitz, one of the great houses of the Empire of Dominia. \
+	They are known for their military service and emphasis on personal bravery."
+	icon_state = "strelitz"
+
+/obj/item/flag/volvalaad
+	name = "House Volvalaad standard"
+	desc = "A blue-and-black standard which represents House Volvalaad, one of the great houses of the Empire of Dominia. \
+	They are known for their reformist ideals, and scientific prowess."
+	flag_path = "volvalaad"
+
+/obj/structure/sign/flag/volvalaad
+	name = "House Volvalaad standard"
+	desc = "A blue-and-black standard which represents House Volvalaad, one of the great houses of the Empire of Dominia. \
+	They are known for their Habsburgian inbreeding, reformist ideals, and scientific prowess."
+	icon_state = "volvalaad"
+
+/obj/item/flag/kazkhz
+	name = "House Kazkhz standard"
+	desc = "A red-and-orange standard with a circular chevron which represents House Kazhkz, one of the great houses of the \
+	Empire of Dominia. They are known for their conservative nature and aversion to augmentation."
+	flag_path = "kazkhz"
+
+/obj/structure/sign/flag/kazkhz
+	name = "House Kazkhz standard"
+	desc = "A red-and-orange standard with a circular chevron which represents House Kazhkz, one of the great houses of the \
+	Empire of Dominia. They are known for their conservative nature and aversion to augmentation."
+	icon_state = "kazkhz"
+
+/obj/item/flag/caladius
+	name = "House Caladius standard"
+	desc = "A purple standard which represensts House Caladius, one of the great houses of the Empire of Dominia. They are \
+	known for their support of the Dominian clergy as well as the skill of their bureaucrats and economists."
+	flag_path = "caladius"
+
+/obj/structure/sign/flag/caladius
+	name = "House Caladius standard"
+	desc = "A purple standard which represensts House Caladius, one of the great houses of the Empire of Dominia. They are \
+	known for their support of the Dominian clergy as well as the skill of their bureaucrats and economists."
+	icon_state = "caladius"
+
+/obj/item/flag/zhao
+	name = "House Zhao standard"
+	desc = "A white Dominian standard with a prominent grey circle which represents House Zhao, one of the great houses of \
+	known for its naval officers and patronage of the Dominian shipbuilding industry."
+	flag_path = "zhao"
+
+/obj/structure/sign/flag/zhao
+	name = "House Zhao standard"
+	desc = "A white Dominian standard with a prominent grey circle which represents House Zhao, one of the great houses of \
+	known for its naval officers and patronage of the Dominian shipbuilding and naval industries."
+	icon_state = "zhao"
 
 /obj/structure/sign/flag/biesel
 	name = "Republic of Biesel flag"

code/modules/client/preference_setup/loadout/loadout_cosmetics.dm

@@ -15,6 +15,19 @@
 	lipsticks["lipstick, jade"] = /obj/item/lipstick/jade
 	lipsticks["lipstick, black"] = /obj/item/lipstick/black
 	lipsticks["lipstick, pink"] = /obj/item/lipstick/pink
+	lipsticks["lipstick, amberred"] = /obj/item/lipstick/amberred
+	lipsticks["lipstick, cherry"] = /obj/item/lipstick/cherry
+	lipsticks["lipstick, orange"] = /obj/item/lipstick/orange
+	lipsticks["lipstick, gold"] = /obj/item/lipstick/gold
+	lipsticks["lipstick, deepred"] = /obj/item/lipstick/deepred
+	lipsticks["lipstick, rosepink"] = /obj/item/lipstick/rosepink
+	lipsticks["lipstick, nude"] = /obj/item/lipstick/nude
+	lipsticks["lipstick, wine"] = /obj/item/lipstick/wine
+	lipsticks["lipstick, peach"] = /obj/item/lipstick/peach
+	lipsticks["lipstick, forestgreen"] = /obj/item/lipstick/forestgreen
+	lipsticks["lipstick, skyblue"] = /obj/item/lipstick/skyblue
+	lipsticks["lipstick, teal"] = /obj/item/lipstick/teal
+
 	gear_tweaks += new/datum/gear_tweak/path(lipsticks)
 
 /datum/gear/cosmetic/mirror

code/modules/client/preference_setup/loadout/loadout_ears.dm

@@ -16,6 +16,11 @@
 	bandanna["black bandanna"] = /obj/item/clothing/ears/bandanna/black
 	gear_tweaks += new/datum/gear_tweak/path(bandanna)
 
+/datum/gear/ears/bandanna_colorable
+	display_name = "neck bandanna (colorable)"
+	path = /obj/item/clothing/ears/bandanna_colorable
+	flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
+
 /datum/gear/ears/headphones
 	display_name = "headphones"
 	path = /obj/item/clothing/ears/earmuffs/headphones
@@ -51,3 +56,4 @@
 	hearingaids["hearing aid, white"] = /obj/item/device/hearing_aid/white
 	hearingaids["hearing aid, skrellian"] = /obj/item/device/hearing_aid/skrell
 	gear_tweaks += new/datum/gear_tweak/path(hearingaids)
+

code/modules/client/preference_setup/loadout/loadout_general.dm

@@ -97,6 +97,7 @@
 	flags = GEAR_HAS_DESC_SELECTION
 
 /datum/gear/banner/New()
+
 	..()
 	var/banners = list()
 	banners["banner, SolGov"] = /obj/item/flag/sol
@@ -120,6 +121,21 @@
 	banners["banner, Coalition of Colonies"] = /obj/item/flag/coalition
 	gear_tweaks += new/datum/gear_tweak/path(banners)
 
+/datum/gear/standard
+	display_name = "dominian great house standard selection"
+	path = /obj/item/flag
+	flags = GEAR_HAS_DESC_SELECTION
+
+/datum/gear/standard/New()
+	..()
+	var/standards = list()
+	standards["standard, Strelitz"] = /obj/item/flag/strelitz
+	standards["standard, Volvalaad"] = /obj/item/flag/volvalaad
+	standards["standard, Kazkhz"] = /obj/item/flag/kazkhz
+	standards["standard, Caladius"] = /obj/item/flag/caladius
+	standards["standard, Zhao"] = /obj/item/flag/zhao
+	gear_tweaks += new/datum/gear_tweak/path(standards)
+
 /datum/gear/flag
 	display_name = "flag selection"
 	cost = 2

code/modules/client/preference_setup/loadout/loadout_head.dm

@@ -216,6 +216,11 @@
 
 	gear_tweaks += new/datum/gear_tweak/path(hijab)
 
+/datum/gear/head/hijab_colorable
+	display_name = "colorable hijab"
+	path = /obj/item/clothing/head/hijab/white
+	flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
+
 /datum/gear/head/turban
 	display_name = "turban selection"
 	path = /obj/item/clothing/head/turban

code/modules/client/preference_setup/loadout/loadout_uniform.dm

@@ -241,7 +241,7 @@
 
 /datum/gear/uniform/elyra_holo
 	display_name = "elyran holographic suit selection"
-	description = "A marvel of Elyran technology, uses hardlight fabric and masks to transform a skin-tight, cozy suit into cultural apparel of your choosing. Has a dial for Midenean, Aemaqii and Perispolisean clothes respectively."
+	description = "A marvel of Elyran technology, uses hardlight fabric and masks to transform a skin-tight, cozy suit into cultural apparel of your choosing. Has a dial for Midenean, Aemaqii and Persepolis clothes respectively."
 	path = /obj/item/clothing/under/elyra_holo
 	flags = GEAR_HAS_DESC_SELECTION
 

code/modules/clothing/ears/bandanna.dm

@@ -22,3 +22,11 @@
 	desc = "A plain black bandanna."
 	icon_state = "band_bk"
 	item_state = "band_bk"
+
+/obj/item/clothing/ears/bandanna_colorable
+	name = "neck bandanna"
+	desc = "A bandanna in 16,777,216 designer colors that goes around the neck."
+	icon_state = "band_wh"
+	item_state = "band_wh"
+	w_class = ITEMSIZE_TINY
+	slot_flags = SLOT_EARS

code/modules/clothing/factions/elyra.dm

@@ -1,6 +1,6 @@
 /obj/item/clothing/under/elyra_holo
 	name = "elyran holographic suit"
-	desc = "A marvel of Elyran technology, uses hardlight fabric and masks to transform a skin-tight, cozy suit into cultural apparel of your choosing. Has a dial for Midenean, Aemaqii and Perispolisean clothes respectively."
+	desc = "A marvel of Elyran technology, uses hardlight fabric and masks to transform a skin-tight, cozy suit into cultural apparel of your choosing. Has a dial for Midenean, Aemaqii and Persepolisean clothes respectively."
 	icon = 'icons/clothing/under/uniforms/elyra_holoclothes.dmi'
 	icon_state = "holosuit_fem"
 	item_state = "holosuit_fem"
@@ -12,13 +12,13 @@
 		"base holographic suit",
 		"medinean artisans holo-dress",
 		"aemaqii ocean holo-dress",
-		"perispolisean desert holo-dress"
+		"persepolisean desert holo-dress"
 		)
 
 	var/list/descriptions = list(
 		"A form-fitting holographic dress with striking purple and white coloration. It possesses high-fidelity, artistic representation of Elyran Medinean culture markers coating its tightly-woven hardlight fabric.",
 		"A fine holo-dress which owes its overall design to the chemical seas of Aemaqq, with itself flowing gently in waves. It looks particularly cozy, and protective against a cold ocean breeze.",
-		"A loose, airy holo-dress with clashing earthen and bright colors. The design is iconic among the Elyran Perispolisean native populations due to its expressive contrast and the hot climate."
+		"A loose, airy holo-dress with clashing earthen and bright colors. The design is iconic among the Elyran Persepolisean native populations due to its expressive contrast and the hot climate."
 		)
 
 /obj/item/clothing/under/elyra_holo/masc
@@ -28,12 +28,12 @@
 		"base holographic suit",
 		"medinean artisans holo-suit",
 		"aemaqii fur outfit",
-		"perispolisean nomads outfit"
+		"persepolisean nomads outfit"
 		)
 	descriptions = list(
 		"A tight-fitting hardlight suit decorated with golden highlights to contrast its red, purplish overshirt and jet black pants. A favorite among the Elyran planet of Medina.",
 		"High quality, and colorful fur derived from the colder regions of Aemaqq's chemical seas. Were this outfit real, you'd probably assume the thick, stump and even branch-like fur to be extracted from one of its countless sea leviathans. Even the holographic variant is excellent at trapping heat.",
-		"A loose holographic outfit, sturdy, baggy and cool with plentiful pockets. The baggy over-wear is a trend on the Elyran world Perispolis due to its hot climate, and this particular style has spread like wildfire across other warm worlds as well. "
+		"A loose holographic outfit, sturdy, baggy and cool with plentiful pockets. The baggy over-wear is a trend on the Elyran world Persepolis due to its hot climate, and this particular style has spread like wildfire across other warm worlds as well. "
 		)
 
 /obj/item/clothing/under/elyra_holo/Initialize()

code/modules/clothing/head/misc.dm

@@ -291,6 +291,7 @@
 	flags_inv = BLOCKHAIR
 	body_parts_covered = 0
 	contained_sprite = 1
+	slot_flags = SLOT_EARS  | SLOT_HEAD
 
 /obj/item/clothing/head/hijab/grey
 	name = "grey hijab"

html/changelogs/stryker-loadoutpr9.yml

@@ -0,0 +1,46 @@
+################################
+# 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
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: Stryker, NiennaB
+
+# 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 new Dominian Great House standards in the loadout general tab."
+  - rscadd: "Added colorable bandannas to the loadout ear tab."
+  - rscadd: "Reworked hijab colors and added a colorable hijab, courtesy of NiennaB."
+  - tweak: "Made hijabs fit in the ear slot so you can fit them under hats."  
+  - rscadd: "Reworked lipstick colors and added new lipsticks colors, courtesy of NiennaB."
+  - tweak: "Changed all references of Persipolis to Persepolis."