diff --git a/aurorastation.dme b/aurorastation.dme index 608920e6d5a..23564f52041 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -3149,4 +3149,4 @@ #include "maps\sccv_horizon\code\sccv_horizon_unittest.dm" #include "maps\templates\distress\distress_equipment.dm" #include "maps\templates\orbital\orbital_templates.dm" -// END_INCLUDE +// END_INCLUDE \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index 481ff24b428..61e1f137074 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -219,6 +219,7 @@ shirt["dress shirt, v-neck alt rolled up"] = /obj/item/clothing/accessory/dressshirt/alt/vneck/rolled shirt["dress shirt, deep v-neck"] = /obj/item/clothing/accessory/dressshirt/deepv shirt["dress shirt, deep v-neck rolled up"] = /obj/item/clothing/accessory/dressshirt/deepv/rolled + shirt["dress shirt, asymmetric"] = /obj/item/clothing/accessory/dressshirt/asymmetric shirt["long-sleeved shirt"] = /obj/item/clothing/accessory/longsleeve shirt["long-sleeved shirt, black striped"] = /obj/item/clothing/accessory/longsleeve_s shirt["long-sleeved shirt, blue striped"] = /obj/item/clothing/accessory/longsleeve_sb @@ -394,6 +395,11 @@ sash["white sash"] =/obj/item/clothing/accessory/sash/white gear_tweaks += new /datum/gear_tweak/path(sash) +/datum/gear/accessory/sash_horizontal + display_name = "horizontal sash (colourable)" + path = /obj/item/clothing/accessory/sash/horizontal + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + /datum/gear/accessory/passcard display_name = "human passcard selection" path = /obj/item/clothing/accessory/badge/passcard diff --git a/code/modules/client/preference_setup/loadout/loadout_religion.dm b/code/modules/client/preference_setup/loadout/loadout_religion.dm index 35f3f964b7a..3648e72400d 100644 --- a/code/modules/client/preference_setup/loadout/loadout_religion.dm +++ b/code/modules/client/preference_setup/loadout/loadout_religion.dm @@ -33,6 +33,10 @@ display_name = "rosary" path = /obj/item/clothing/accessory/rosary +/datum/gear/religion/shintorobe + display_name = "shrine maiden robe" + path = /obj/item/clothing/under/konyangdresstraditional/red + /datum/gear/religion/kippah display_name = "kippah" description = "A head covering commonly worn by those of Jewish faith." diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 06f27523d8b..e86fca80cd4 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -66,6 +66,7 @@ skirts["tube skirt"] = /obj/item/clothing/under/skirt/tube skirts["jumper skirt"] = /obj/item/clothing/under/skirt/jumper skirts["jumper dress"] = /obj/item/clothing/under/skirt/jumper_highcut + skirts["long straight skirt"] = /obj/item/clothing/under/skirt/straightlong gear_tweaks += new /datum/gear_tweak/path(skirts) /datum/gear/uniform/suit @@ -314,6 +315,22 @@ path = /obj/item/clothing/under/konyangdress flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION +/datum/gear/uniform/konyangtraditional + display_name = "traditional konyanger dress selection" + description = "A selection of traditional Konyanger formal and religious wear." + path = /obj/item/clothing/under/konyangdresstraditional + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION + +/datum/gear/uniform/konyangtraditional/New() + ..() + var/list/konyangtraditional = list() + konyangtraditional["pink traditional konyanger dress"] = /obj/item/clothing/under/konyangdresstraditional + konyangtraditional["green traditional konyanger dress"] = /obj/item/clothing/under/konyangdresstraditional/green + konyangtraditional["blue traditional konyanger dress"] = /obj/item/clothing/under/konyangdresstraditional/blue + konyangtraditional["national-colored traditional konyanger dress"] = /obj/item/clothing/under/konyangdresstraditional/national + konyangtraditional["national-colored traditional konyanger dress with vest"] = /obj/item/clothing/under/konyangdresstraditional/national/vest + gear_tweaks += new /datum/gear_tweak/path(konyangtraditional) + /datum/gear/uniform/zhongshan display_name = "zhongshan suit" path = /obj/item/clothing/under/zhongshan diff --git a/code/modules/clothing/factions/konyang.dm b/code/modules/clothing/factions/konyang.dm index 669aec304b3..56dcadd7937 100644 --- a/code/modules/clothing/factions/konyang.dm +++ b/code/modules/clothing/factions/konyang.dm @@ -72,4 +72,50 @@ worn_state = "konyang_dress" item_state = "konyang_dress" slot_flags = SLOT_OCLOTHING | SLOT_ICLOTHING - contained_sprite = TRUE \ No newline at end of file + contained_sprite = TRUE + +/obj/item/clothing/under/konyangdresstraditional + name = "konyanger traditional dress" + desc = "A traditional hakama and kosode pairing worn on Konyang, usually at formal functions or by shrine maidens. This one features a pink hakama and white kosode." + desc_fluff = "Carried over to Konyang from Earth, this dress was usually worn by shrine maidens of the Shinto faith back on Earth. \ + It has since been appropriated by many Konyangers as a type of formal dress, and simply as a manner of fashion. The hot and humid climate of the planet however, has necessitated \ + that most dresses of this type are made of lighter fabrics indigenous to the planet." + icon = 'icons/clothing/under/uniforms/konyang_dress_traditional.dmi' + icon_state = "konyang_dress_traditional" + item_state = "konyang_dress_traditional" + slot_flags = SLOT_ICLOTHING + contained_sprite = TRUE + +/obj/item/clothing/under/konyangdresstraditional/red + desc = "A traditional red hakama and white kosode pairing worn by Shintoist shrine maidens." + icon_state = "konyang_dress_traditional_red" + item_state = "konyang_dress_traditional_red" + +/obj/item/clothing/under/konyangdresstraditional/green + desc = "A traditional hakama and kosode pairing worn on Konyang, usually at formal functions or by shrine maidens. This one features a green hakama and white kosode." + icon_state = "konyang_dress_traditional_green" + item_state = "konyang_dress_traditional_green" + +/obj/item/clothing/under/konyangdresstraditional/blue + desc = "A traditional hakama and kosode pairing worn on Konyang, usually at formal functions or by shrine maidens. This one features a blue hakama and white kosode." + icon_state = "konyang_dress_traditional_blue" + item_state = "konyang_dress_traditional_blue" + +/obj/item/clothing/under/konyangdresstraditional/national + desc = "A traditional hakama and kosode pairing worn on Konyang, usually at formal functions or by shrine maidens. This one features a blue hakama and yellow kosode \ + the colors of the flag of Konyang." + desc_fluff = "The colors of the traditional shrine maiden outfit on Earth were designed to evoke the spirit of its host nation. Similarly, as Shinto evolved on Konyang to explain \ + the equality of IPC and humans, many outfits were tailored in these new colors to represent the values of the nation, yellow representing prosperity, and blue representing the waterways \ + of the planet. Although tailored for Shintoist monks, some Konyangers wear the outfit as a sign of patriotism on national holildays." + icon_state = "konyang_dress_traditional_national" + item_state = "konyang_dress_traditional_national" + +/obj/item/clothing/under/konyangdresstraditional/national/vest + desc = "A traditional hakama and kosode pairing worn on Konyang, usually at formal functions or by shrine maidens. This one features a blue hakama, white vest, and yellow kosode \ + the colors of the flag of Konyang." + desc_fluff = "The colors of the traditional shrine maiden outfit on Earth were designed to evoke the spirit of its host nation. Similarly, as Shinto evolved on Konyang to explain \ + the equality of IPC and humans, many outfits were tailored in these new colors to represent the values of the nation, white representing purity, yellow representing prosperity, and blue representing the waterways \ + of the planet. Given the climate, the addition of a vest renders the outfit uncomfortably hot, however this is regarded as an acceptable drawback for protecting the rest of the ensemble from the perrenial rains on the planet. \ + Although tailored for Shintoist monks, some Konyangers wear the outfit as a sign of patriotism on national holildays." + icon_state = "konyang_dress_traditional_national_vest" + item_state = "konyang_dress_traditional_national_vest" \ No newline at end of file diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index d210b1a9eb5..547728e1324 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -427,6 +427,13 @@ item_state = "sash_colourable" icon_state = "sash_colourable" +/obj/item/clothing/accessory/sash/horizontal + name = "horizontal sash" + desc = "A sash, designed to be worn around the waist." + item_state = "sash_horizontal" + icon_state = "sash_horizontal" + icon = 'icons/clothing/accessories/sash_horizontal.dmi' + /* * Cloak */ diff --git a/code/modules/clothing/under/accessories/badges.dm b/code/modules/clothing/under/accessories/badges.dm index 27b8f7ba952..9746910c0d4 100644 --- a/code/modules/clothing/under/accessories/badges.dm +++ b/code/modules/clothing/under/accessories/badges.dm @@ -468,8 +468,7 @@ /obj/item/clothing/accessory/badge/passcard/konyang name = "konyanger passcard" desc = "A passcard issued to residents of the planet Konyang." - desc_fluff = "The 'homeworld' of the human positronic intelligence, life on Konyang is a tightly-knit tapestry of organic-synthetic relations. This is even reflected in their passcards, featuring dried moss \ - from the planet's farms in the same plastic casing as a small sigil of the Perfection said to grant safe passage abroad for adherents." + desc_fluff = "The 'homeworld' of the human positronic intelligence, life on Konyang is a tightly-knit tapestry of organic-synthetic relations. The planet's unique conditions are reflected by a small piece of preserved moss stored in the card's plastic casing." icon_state = "passcard_konyang" item_state = "passcard_konyang" diff --git a/code/modules/clothing/under/accessories/shirts.dm b/code/modules/clothing/under/accessories/shirts.dm index 3c810359d50..ecbea585dc3 100644 --- a/code/modules/clothing/under/accessories/shirts.dm +++ b/code/modules/clothing/under/accessories/shirts.dm @@ -193,6 +193,12 @@ icon_state = "puffyblouse" item_state = "puffyblouse" +/obj/item/clothing/accessory/dressshirt/asymmetric + name = "asymmetric dress shirt" + desc = "A casual dress shirt that opens diagonally down the front." + icon_state = "dressshirt_asymmetric" + item_state = "dressshirt_asymmetric" + //Legacy /obj/item/clothing/accessory/wcoat name = "waistcoat" diff --git a/code/modules/clothing/under/skirts.dm b/code/modules/clothing/under/skirts.dm index 1644fcd14d0..fc464010ccb 100644 --- a/code/modules/clothing/under/skirts.dm +++ b/code/modules/clothing/under/skirts.dm @@ -83,6 +83,14 @@ item_state = "skirt_tube" worn_state = "skirt_tube" +/obj/item/clothing/under/skirt/straightlong + name = "straight long skirt" + desc = "A skirt that goes all the way down to the ankles." + desc_fluff = "Enough fabric for two skirts, and then some." + icon_state = "skirt_straightlong" + item_state = "skirt_straightlong" + worn_state = "skirt_straightlong" + /obj/item/clothing/under/skirt/offworlder name = "\improper CR skirt" desc = "A very tight form-fitting padded suit that looks extremely comfortable to wear. This variant seems to have a poofy skirt and longer sleeves than normal." diff --git a/html/changelogs/stryker-loadoutpr12.yml b/html/changelogs/stryker-loadoutpr12.yml new file mode 100644 index 00000000000..dec20a04a40 --- /dev/null +++ b/html/changelogs/stryker-loadoutpr12.yml @@ -0,0 +1,44 @@ +################################ +# 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: The Stryker + +# 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: "Adds a collection of Konyanger traditional dresses to the loadout, as well as a shrine maiden outfit to the religion loadout tab." + - rscadd: "Adds a horizontal sash and asymmetric dress shirt to the accessories tab." + - rscadd: "Adds a long straight skirt to the skirt selection." + - bugfix: "Fixes the positioning of the gat sidesprites." diff --git a/icons/clothing/accessories/sash_horizontal.dmi b/icons/clothing/accessories/sash_horizontal.dmi new file mode 100644 index 00000000000..a6cfc0c0c2b Binary files /dev/null and b/icons/clothing/accessories/sash_horizontal.dmi differ diff --git a/icons/clothing/head/konyang_gat.dmi b/icons/clothing/head/konyang_gat.dmi index dbe3d5bf17d..1ead397a0e2 100644 Binary files a/icons/clothing/head/konyang_gat.dmi and b/icons/clothing/head/konyang_gat.dmi differ diff --git a/icons/clothing/under/uniforms/konyang_dress_traditional.dmi b/icons/clothing/under/uniforms/konyang_dress_traditional.dmi new file mode 100644 index 00000000000..f98ad998bdc Binary files /dev/null and b/icons/clothing/under/uniforms/konyang_dress_traditional.dmi differ diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index 125a5856d8e..ac15c9f3fac 100644 Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ diff --git a/icons/obj/clothing/skirts.dmi b/icons/obj/clothing/skirts.dmi index c195ff66ed9..5a0732e54c3 100644 Binary files a/icons/obj/clothing/skirts.dmi and b/icons/obj/clothing/skirts.dmi differ diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi index efc4c6dedcb..ef058405204 100644 Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ