diff --git a/code/modules/background/citizenship/skrell.dm b/code/modules/background/citizenship/skrell.dm index 5c1dc262217..0be3a2abc18 100644 --- a/code/modules/background/citizenship/skrell.dm +++ b/code/modules/background/citizenship/skrell.dm @@ -100,9 +100,9 @@ if(isvaurca(H)) // there should be a system for this but for now this will have to do i guess H.equip_to_slot_or_del(new /obj/item/clothing/under/gearharness(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/head/vaurca_breeder/nralakk(H), slot_head) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/vaurca/breeder/nralakk(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/vaurca/breeder/cthur(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/vaurca/filter(H), slot_wear_mask) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/vaurca/breeder/nralakk(H), slot_wear_suit) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/vaurca/breeder/cthur(H), slot_wear_suit) H.equip_to_slot_or_del(new /obj/item/storage/backpack/typec/cthur(H), slot_back) H.equip_to_slot_or_del(new /obj/item/gun/energy/fedpistol/nopsi(H), slot_belt) else diff --git a/code/modules/client/preference_setup/loadout/items/xeno/vaurca.dm b/code/modules/client/preference_setup/loadout/items/xeno/vaurca.dm index d694e72b907..1857b3cc7fa 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/vaurca.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/vaurca.dm @@ -300,3 +300,79 @@ culture_restriction = list(/singleton/origin_item/culture/klax, /singleton/origin_item/culture/klax_breeder) sort_category = "Xenowear - Vaurca" flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION + +/datum/gear/head/vaurca_zora_shroud + display_name = "zora flag shroud" + path = /obj/item/clothing/head/vaurca_breeder/flag + cost = 1 + slot = slot_head + whitelisted = list(SPECIES_VAURCA_BREEDER) + culture_restriction = list(/singleton/origin_item/culture/zora_breeder) + sort_category = "Xenowear - Vaurca" + flags = GEAR_HAS_DESC_SELECTION + +/datum/gear/head/vaurca_klax_shroud + display_name = "klax flag shroud" + path = /obj/item/clothing/head/vaurca_breeder/klax/flag + cost = 1 + slot = slot_head + whitelisted = list(SPECIES_VAURCA_BREEDER) + culture_restriction = list(/singleton/origin_item/culture/klax_breeder) + sort_category = "Xenowear - Vaurca" + flags = GEAR_HAS_DESC_SELECTION + +/datum/gear/head/vaurca_cthur_shroud + display_name = "cthur flag shroud" + path = /obj/item/clothing/head/vaurca_breeder/cthur/flag + cost = 1 + slot = slot_head + whitelisted = list(SPECIES_VAURCA_BREEDER) + culture_restriction = list(/singleton/origin_item/culture/cthur_breeder) + sort_category = "Xenowear - Vaurca" + flags = GEAR_HAS_DESC_SELECTION + +/datum/gear/accessory/vaurca_rockstone + display_name = "rockstone cape" + description = "A cape for Moghesian nobility for a K'lax Vaurca." + path = /obj/item/clothing/accessory/vaurca_breeder/rockstone_cape + cost = 1 + whitelisted = list(SPECIES_VAURCA_BREEDER) + culture_restriction = list(/singleton/origin_item/culture/klax_breeder) + sort_category = "Xenowear - Vaurca" + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION | GEAR_HAS_ACCENT_COLOR_SELECTION + +/datum/gear/accessory/vaurca_cthur_llc + display_name = "cthur, llc cape" + description = "A cape for C'thur, LLC Vaurca Gyne diplomats." + path = /obj/item/clothing/accessory/vaurca_breeder/cthur_llc_cape + cost = 1 + whitelisted = list(SPECIES_VAURCA_BREEDER) + culture_restriction = list(/singleton/origin_item/culture/cthur_breeder) + sort_category = "Xenowear - Vaurca" + flags = GEAR_HAS_DESC_SELECTION + +/datum/gear/head/vaurca_gyne_shroud + display_name = "colorable gyne shroud" + path = /obj/item/clothing/head/vaurca_breeder/colorable + cost = 1 + whitelisted = list(SPECIES_VAURCA_BREEDER) + sort_category = "Xenowear - Vaurca" + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + +/datum/gear/head/vaurca_gyne_clothes + display_name = "colorable gyne clothes" + path = /obj/item/clothing/suit/vaurca/breeder/colorable + cost = 1 + slot = slot_wear_suit + whitelisted = list(SPECIES_VAURCA_BREEDER) + sort_category = "Xenowear - Vaurca" + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + +/datum/gear/head/vaurca_gyne_shoes + display_name = "colorable gyne shoes" + path = /obj/item/clothing/shoes/vaurca/breeder/colorable + cost = 1 + slot = slot_shoes + whitelisted = list(SPECIES_VAURCA_BREEDER) + sort_category = "Xenowear - Vaurca" + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION diff --git a/code/modules/clothing/head/xenos/vaurca.dm b/code/modules/clothing/head/xenos/vaurca.dm index 62dbd14d270..2240ea7ba8e 100644 --- a/code/modules/clothing/head/xenos/vaurca.dm +++ b/code/modules/clothing/head/xenos/vaurca.dm @@ -1,6 +1,6 @@ /obj/item/clothing/head/vaurca_breeder name = "zo'ra representative shroud" - desc = "Large shroud used by Zo'ra representatives." + desc = "A large shroud used by Zo'ra representatives." icon = 'icons/mob/species/breeder/inventory.dmi' item_state = "hive_rep_shroud" icon_state = "hive_rep_shroud" @@ -27,32 +27,64 @@ user.update_icon() user.update_inv_head() +/obj/item/clothing/head/vaurca_breeder/flag + desc = "A large shroud used by Zo'ra representatives. This one proudly displays the flag of Hive Zo'ra." + desc_extended = "The flag of the Zo'ra represents their position in the Republic of Biesel whilst still being unique enough to identify them alone." + item_state = "hive_rep_shroud_flag" + icon_state = "hive_rep_shroud_flag" + /obj/item/clothing/head/vaurca_breeder/klax - name = "k'lax represenatitve shroud" - desc = "Large shroud used by K'lax representatives." + name = "k'lax representative shroud" + desc = "A large shroud used by K'lax representatives." item_state = "hive_rep_shroud_klax" icon_state = "hive_rep_shroud_klax" +/obj/item/clothing/head/vaurca_breeder/klax/flag + desc = "A large shroud used by K'lax representatives. This one proudly displays the flag of Hive K'lax." + desc_extended = "Under heavy supervision by the Izweski Nation, the K'laxane flag represents the Hive's Vassalage." + item_state = "hive_rep_shroud_klax_flag" + icon_state = "hive_rep_shroud_klax_flag" + /obj/item/clothing/head/vaurca_breeder/cthur name = "c'thur representative shroud" - desc = "Large shroud used by C'thur representatives." + desc = "A large shroud used by C'thur representatives." item_state = "hive_rep_shroud_cthur" icon_state = "hive_rep_shroud_cthur" +/obj/item/clothing/head/vaurca_breeder/cthur/flag + desc = "A large shroud used by C'thur representatives. This one proudly displays the flag of Hive C'thur." + desc_extended = "The flag of the C'thur represents the Hive's independence and gratitude towards their Nralakk Federation benefactors." + item_state = "hive_rep_shroud_cthur_flag" + icon_state = "hive_rep_shroud_cthur_flag" + /obj/item/clothing/head/vaurca_breeder/nralakk name = "nralakk representative shroud" - desc = "Large shroud used by C'thur Nralakk representatives." + desc = "A large shroud used by C'thur Nralakk representatives." item_state = "hive_rep_shroud_nralakk" icon_state = "hive_rep_shroud_nralakk" /obj/item/clothing/head/vaurca_breeder/biesel name = "biesel representative shroud" - desc = "Large shroud used by Zo'ra Republic of Biesel representatives." + desc = "A large shroud used by Zo'ra Republic of Biesel representatives." item_state = "hive_rep_shroud_biesel" icon_state = "hive_rep_shroud_biesel" /obj/item/clothing/head/vaurca_breeder/hegemony name = "hegemony representative shroud" - desc = "Large shroud used by K'lax Izweski Hegemony representatives." + desc = "A large shroud used by K'lax Izweski Hegemony representatives." item_state = "hive_rep_shroud_hegemony" icon_state = "hive_rep_shroud_hegemony" + +/obj/item/clothing/head/vaurca_breeder/colorable + name = "representative shroud" + desc = "A large shroud used by Vaurca Gynes." + item_state = "hive_rep_shroud_colorable" + icon_state = "hive_rep_shroud_colorable" + build_from_parts = TRUE + worn_overlay = "cover" + +/obj/item/clothing/head/vaurca_breeder/colorable/flag + desc = "A large shroud used by Vaurca Gynes. This one displays a flag on the back of the head." + item_state = "hive_rep_shroud_colorable_flag" + icon_state = "hive_rep_shroud_colorable_flag" + has_accents = TRUE diff --git a/code/modules/clothing/shoes/xeno/vaurca.dm b/code/modules/clothing/shoes/xeno/vaurca.dm index e3ef430d794..2eb72169f9a 100644 --- a/code/modules/clothing/shoes/xeno/vaurca.dm +++ b/code/modules/clothing/shoes/xeno/vaurca.dm @@ -44,8 +44,8 @@ item_state = "hive_rep_shoes_cthur" icon_state = "hive_rep_shoes_cthur" -/obj/item/clothing/shoes/vaurca/breeder/nralakk - name = "nralakk representative shoes" - desc = "Large shoes used by Nralakk representatives." - item_state = "hive_rep_shoes_nralakk" - icon_state = "hive_rep_shoes_nralakk" +/obj/item/clothing/shoes/vaurca/breeder/colorable + name = "representative shoes" + desc = "Large shoes used by Vaurca Gynes." + item_state = "hive_rep_shoes_colorable" + icon_state = "hive_rep_shoes_colorable" diff --git a/code/modules/clothing/suits/xeno/vaurca.dm b/code/modules/clothing/suits/xeno/vaurca.dm index 70f16cb4952..56d96f44031 100644 --- a/code/modules/clothing/suits/xeno/vaurca.dm +++ b/code/modules/clothing/suits/xeno/vaurca.dm @@ -54,8 +54,10 @@ item_state = "hive_rep_clothes_cthur" icon_state = "hive_rep_clothes_cthur" -/obj/item/clothing/suit/vaurca/breeder/nralakk - name = "nralakk representative clothes" - desc = "A large piece of clothing used by Nralakk representatives." - item_state = "hive_rep_clothes_nralakk" - icon_state = "hive_rep_clothes_nralakk" +/obj/item/clothing/suit/vaurca/breeder/colorable + name = "representative clothes" + desc = "A large piece of clothing used by Vaurca Gynes." + item_state = "hive_rep_clothes_colorable" + icon_state = "hive_rep_clothes_colorable" + build_from_parts = TRUE + worn_overlay = "rope" diff --git a/code/modules/clothing/under/accessories/xeno/vaurca.dm b/code/modules/clothing/under/accessories/xeno/vaurca.dm index 2189ee819f3..5a09bb453cd 100644 --- a/code/modules/clothing/under/accessories/xeno/vaurca.dm +++ b/code/modules/clothing/under/accessories/xeno/vaurca.dm @@ -9,3 +9,40 @@ body_parts_covered = UPPER_TORSO build_from_parts = TRUE has_accents = TRUE + +/obj/item/clothing/accessory/vaurca_breeder + name = "vaurca breeder parent accessory" + desc = "You shouldn't be seeing this." + icon = 'icons/mob/species/breeder/accessories.dmi' + icon_override = null + contained_sprite = TRUE + species_restricted = list(BODYTYPE_VAURCA_BREEDER) + +/obj/item/clothing/accessory/vaurca_breeder/rockstone_cape + name = "k'lax rockstone cape" + desc = "A cape seen exclusively on nobility. The chain is adorned with precious, multi-color stones, hence its name. This one is fitted to a K'lax Vaurca Gyne's arm." + desc_extended = "A simple drape over the shoulder is done easily; the distinguishing part between the commoners and \ + nobility is the sheer elegance of the rockstone cape. Vibrant stones adorn the heavy collar, and the cape itself \ + is embroidered with gold." + icon_state = "gynerockstone" + item_state = "gynerockstone" + build_from_parts = TRUE + worn_overlay = "chain" + has_accents = TRUE + +/obj/item/clothing/accessory/vaurca_breeder/star_cape + name = "c'thur star cape" + desc = "A decorated cape. Starry patterns have been woven into the fabric. This one is fitted to a C'thur Vaurca Gyne's arm." + icon_state = "gynestarcape" + item_state = "gynestarcape" + +/obj/item/clothing/accessory/vaurca_breeder/cthur_llc_cape + name = "c'thur llc cape" + desc = "A cape fitted to a C'thur Vaurca Gyne's arm. This one contains the logo of C'thur, LLC." + desc_extended = "C'thur, LLC, officially The C'thuric Hive Holdings, LLC, is an Eridanian company headquartered in Sector V, Kianda. \ + It is noted for its long-term labor agreements with megacorporations and its proprietary scientific developments. C'thur, LLC is majorly owned by \ + High Queen C'thur and operates in a similar structure as the Hive itself. While distinctions between the C'thur Hive and the company are legally upheld within \ + the Nralakk Federation, this separation becomes less clear in human space. Lesser queens hold membership within the company, granting them ownership rights and a \ + stake in its profits." + icon_state = "cthurllc" + item_state = "cthurllc" diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index d8ccead8e71..b74aa58100c 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -14,7 +14,7 @@ body_parts_covered = 0 species_restricted = null sprite_sheets = list( - BODYTYPE_VAURCA_BREEDER = 'icons/mob/species/breeder/suit.dmi', + BODYTYPE_VAURCA_BREEDER = 'icons/mob/species/breeder/uniform.dmi', BODYTYPE_VAURCA_BULWARK = 'icons/mob/species/bulwark/uniform.dmi' ) diff --git a/html/changelogs/SimpleMaroon-gyneoutfits.yml b/html/changelogs/SimpleMaroon-gyneoutfits.yml new file mode 100644 index 00000000000..150291cbf42 --- /dev/null +++ b/html/changelogs/SimpleMaroon-gyneoutfits.yml @@ -0,0 +1,67 @@ +################################ +# 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 +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: SimpleMaroon + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Moved the icon state for the Vaurca Gyne gear harness to a more logical file." + - spellcheck: "Corrected the word 'representative' in the K'lax Representative Shroud." + - spellcheck: "Changed 'large shroud' to 'a large shroud' on all the Vaurca Gyne shroud items." + - imageadd: "Added unique Vaurca Gyne shrouds with Hive flags for all three Hives." + - imageadd: "Added recolorable Vaurca Gyne shoes, clothes, and shrouds." + - imageadd: "Added a K'lax rockstone cape to the loadout." + - qol: "Changed the star cape from the Nralakk Vaurca Gyne suit to an independent accessory, and made the colors of the stars more in line with the cosmic cape to represent Vaurca Gyne longevity." + - imagedel: "Removed the unnecessary Vaurca Gyne shroud sprites from suit.dmi." + - imagedel: "Deleted the Nralakk Vaurca Gyne suit due to no longer being needed with the accessory change." + - imagedel: "Got rid of the Nralakk representative Vaurca Gyne shoes, as they are exactly the same as the C'thur ones." diff --git a/icons/mob/species/breeder/accessories.dmi b/icons/mob/species/breeder/accessories.dmi new file mode 100644 index 00000000000..38e12358d10 Binary files /dev/null and b/icons/mob/species/breeder/accessories.dmi differ diff --git a/icons/mob/species/breeder/head.dmi b/icons/mob/species/breeder/head.dmi index 60e85dae046..06cccb3480b 100644 Binary files a/icons/mob/species/breeder/head.dmi and b/icons/mob/species/breeder/head.dmi differ diff --git a/icons/mob/species/breeder/inventory.dmi b/icons/mob/species/breeder/inventory.dmi index 9bb5610b8ef..609e6ac4bf0 100644 Binary files a/icons/mob/species/breeder/inventory.dmi and b/icons/mob/species/breeder/inventory.dmi differ diff --git a/icons/mob/species/breeder/shoes.dmi b/icons/mob/species/breeder/shoes.dmi index c42a92ec159..e9d44c54c84 100644 Binary files a/icons/mob/species/breeder/shoes.dmi and b/icons/mob/species/breeder/shoes.dmi differ diff --git a/icons/mob/species/breeder/suit.dmi b/icons/mob/species/breeder/suit.dmi index 3a17b773523..e0d1b4ca529 100644 Binary files a/icons/mob/species/breeder/suit.dmi and b/icons/mob/species/breeder/suit.dmi differ diff --git a/icons/mob/species/breeder/uniform.dmi b/icons/mob/species/breeder/uniform.dmi new file mode 100644 index 00000000000..a5ecf29dab7 Binary files /dev/null and b/icons/mob/species/breeder/uniform.dmi differ