diff --git a/aurorastation.dme b/aurorastation.dme index 71d5cf57ad3..7fbb205ef16 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -1355,6 +1355,8 @@ #include "code\modules\clothing\ears\earmuffs.dm" #include "code\modules\clothing\ears\skrell.dm" #include "code\modules\clothing\factions\dominia.dm" +#include "code\modules\clothing\factions\himeo.dm" +#include "code\modules\clothing\factions\vysoka.dm" #include "code\modules\clothing\glasses\glasses.dm" #include "code\modules\clothing\glasses\hud.dm" #include "code\modules\clothing\gloves\arm_guard.dm" diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index 81226b0f92f..2410793880a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -252,3 +252,13 @@ display_name = "padded cap" path = /obj/item/clothing/head/padded flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + +/datum/gear/head/himeo + display_name = "himean cap" + path = /obj/item/clothing/head/soft/himeo + flags = GEAR_HAS_DESC_SELECTION + +/datum/gear/head/vysoka + display_name = "vysokan fur cap" + path = /obj/item/clothing/head/soft/vysoka + flags = GEAR_HAS_DESC_SELECTION \ 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 e3c8aeb6018..f8ef36c191a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -324,3 +324,21 @@ cardigan["sweater cardigan"] = /obj/item/clothing/suit/storage/toggle/cardigan/sweater cardigan["argyle cardigan"] = /obj/item/clothing/suit/storage/toggle/cardigan/argyle gear_tweaks += new/datum/gear_tweak/path(cardigan) + +/datum/gear/suit/himeo + display_name = "himean coat" + path = /obj/item/clothing/suit/storage/toggle/himeo + flags = GEAR_HAS_DESC_SELECTION + +/datum/gear/suit/vysoka + display_name = "chokha selection" + description = "A selection of Vysokan chokhas." + path = /obj/item/clothing/suit/storage/vysoka_m + flags = GEAR_HAS_DESC_SELECTION + +/datum/gear/suit/vysoka/New() + ..() + var/coat = list() + coat["feminine chokha"] = /obj/item/clothing/suit/storage/vysoka_f + coat["masculine chokha"] = /obj/item/clothing/suit/storage/vysoka_m + gear_tweaks += new/datum/gear_tweak/path(coat) \ No newline at end of file diff --git a/code/modules/clothing/factions/himeo.dm b/code/modules/clothing/factions/himeo.dm new file mode 100644 index 00000000000..60d736217b9 --- /dev/null +++ b/code/modules/clothing/factions/himeo.dm @@ -0,0 +1,20 @@ +/obj/item/clothing/suit/storage/toggle/himeo + name = "himean bekesha" + desc = "A heavy winter coat from Himeo, made of synthetic fish fur. It looks extremely comfortable, if a bit hot for the Aurora's normal temperature." + desc_fluff = "While traditional Solarian bekeshas are often made of animal fur and hide, this particular variant is made of Himean fish fur and other synthetic materials. Heavy coats such as this are a common sight on Himeo, due to the extremely cold temperatures of the planet." + icon = 'icons/clothing/suits/coats/himeo_coat.dmi' + icon_state = "coat_himeo" + item_state = "coat_himeo" + icon_open = "coat_himeo_open" + icon_closed = "coat_himeo" + contained_sprite = TRUE + +/obj/item/clothing/head/soft/himeo + + name = "himean cap" + desc = "A heavy winter coat from Himeo, made of synthetic fish fur. It looks extremely comfortable, if a bit hot for the Aurora's normal temperature." + desc_fluff = "The M372 field cap is a standard-issue cap of Himeo's military, and a common sight throughout the planet and the space around it. This particular model is a reproduction, due to its lack of the traditional ear covers on the Himean model." + icon = 'icons/clothing/head/himeo_cap.dmi' + icon_state = "cap_himeo" + item_state = "cap_himeo" + contained_sprite = TRUE \ No newline at end of file diff --git a/code/modules/clothing/factions/vysoka.dm b/code/modules/clothing/factions/vysoka.dm new file mode 100644 index 00000000000..226e2bcf957 --- /dev/null +++ b/code/modules/clothing/factions/vysoka.dm @@ -0,0 +1,26 @@ +/obj/item/clothing/suit/storage/vysoka_m + name = "chokha" + desc = " A woolen coat with a high neck commonly worn on Vysoka." + desc_fluff = "Chokhas are a common choice of outerwear for men and women on Vysoka, and are often colored differently based on their city - or host - of origin. The chokha has become something of a cultural symbol of Vysoka, and is often worn off-world by its citizens." + icon = 'icons/clothing/suits/coats/vysoka_chokha_male.dmi' + icon_state = "chokha_vysoka_m" + item_state = "chokha_vysoka_m" + contained_sprite = TRUE + +/obj/item/clothing/suit/storage/vysoka_f + name = "chokha" + desc = " A woolen coat with a high neck commonly worn on Vysoka." + desc_fluff = "Chokhas are a common choice of outerwear for men and women on Vysoka, and are often colored differently based on their city - or host - of origin. The chokha has become something of a cultural symbol of Vysoka, and is often worn off-world by its citizens." + icon = 'icons/clothing/suits/coats/vysoka_chokha_female.dmi' + icon_state = "chokha_vysoka_f" + item_state = "chokha_vysoka_f" + contained_sprite = TRUE + +/obj/item/clothing/head/soft/vysoka + name = "vysokan fur cap" + desc = "A fur hat from Vysoka made of authentic ohdker fur." + desc_fluff = "The ohdker is a common animal on Vysoka that serves as a livestock and beast of burden, depending on the needs at the time. Its fur is highly prized on Vysoka, and major cities often export it off-world to location such as Xanu Prime." + icon_state = "cap_vysoka" + item_state = "cap_vysoka" + icon = 'icons/clothing/head/vysoka_cap.dmi' + contained_sprite = TRUE \ No newline at end of file diff --git a/html/changelogs/kyres1-#9176.yml b/html/changelogs/kyres1-#9176.yml new file mode 100644 index 00000000000..c60d90d32a4 --- /dev/null +++ b/html/changelogs/kyres1-#9176.yml @@ -0,0 +1,41 @@ +################################ +# 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: Kyres1 + +# 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 Himean and Vysokan clothing to the loadout." diff --git a/icons/clothing/head/himeo_cap.dmi b/icons/clothing/head/himeo_cap.dmi new file mode 100644 index 00000000000..163293ba6c9 Binary files /dev/null and b/icons/clothing/head/himeo_cap.dmi differ diff --git a/icons/clothing/head/vysoka_cap.dmi b/icons/clothing/head/vysoka_cap.dmi new file mode 100644 index 00000000000..5648791d9c4 Binary files /dev/null and b/icons/clothing/head/vysoka_cap.dmi differ diff --git a/icons/clothing/suits/coats/himeo_coat.dmi b/icons/clothing/suits/coats/himeo_coat.dmi new file mode 100644 index 00000000000..1c5d9b1c1ee Binary files /dev/null and b/icons/clothing/suits/coats/himeo_coat.dmi differ diff --git a/icons/clothing/suits/coats/vysoka_chokha_female.dmi b/icons/clothing/suits/coats/vysoka_chokha_female.dmi new file mode 100644 index 00000000000..c63979a83f5 Binary files /dev/null and b/icons/clothing/suits/coats/vysoka_chokha_female.dmi differ diff --git a/icons/clothing/suits/coats/vysoka_chokha_male.dmi b/icons/clothing/suits/coats/vysoka_chokha_male.dmi new file mode 100644 index 00000000000..aeb24e42954 Binary files /dev/null and b/icons/clothing/suits/coats/vysoka_chokha_male.dmi differ