diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index ca85f15db15..24bdcbae9fa 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -434,6 +434,9 @@ datum/gear/suit/colorvest konyangcoat["red konyanger jumpjacket"] = /obj/item/clothing/suit/storage/toggle/konyang/pants konyangcoat["orange konyanger jumpjacket"] = /obj/item/clothing/suit/storage/toggle/konyang/orange konyangcoat["blue konyanger jumpjacket"] = /obj/item/clothing/suit/storage/toggle/konyang/blue + konyangcoat["biege double-breasted Konyanger jacket"] = /obj/item/clothing/suit/storage/toggle/konyang/dbjacket + konyangcoat["black double-breasted Konyanger jacket"] = /obj/item/clothing/suit/storage/toggle/konyang/dbjacket/black + konyangcoat["blue double-breasted Konyanger jacket"] = /obj/item/clothing/suit/storage/toggle/konyang/dbjacket/blue gear_tweaks += new /datum/gear_tweak/path(konyangcoat) /datum/gear/suit/gadpathur diff --git a/code/modules/clothing/factions/konyang.dm b/code/modules/clothing/factions/konyang.dm index 93284800f19..4f3a7f5f3eb 100644 --- a/code/modules/clothing/factions/konyang.dm +++ b/code/modules/clothing/factions/konyang.dm @@ -63,6 +63,27 @@ icon_state = "konyang_jacket_blue" item_state = "konyang_jacket_blue" +/obj/item/clothing/suit/storage/toggle/konyang/dbjacket + name = "double-breasted Konyanger jacket" + desc = "Styled after the latest fashion trends on Konyang, this hybrid faux-leather and polyester mesh jacket was built with the planet’s humid climate in mind. This one has a pale beige color." + desc_extended = "Only recently entering the larger Coalition scene, Konyanger fashion has taken the frontier by storm, owing to its unique blend of durability, waterproofing, \ + and breathability. This innovation in clothing was only accomplished due to Konyanger fashion brands utilizing the fabrics and textiles unique to their planet." + icon = 'icons/clothing/suits/konyang_double_breasted_jacket.dmi' + icon_state = "konyang_coat_pale" + item_state = "konyang_coat_pale" + heat_protection = UPPER_TORSO|LOWER_TORSO|ARMS + max_heat_protection_temperature = 313 // Provides heat protection up to 313 Kelvin (~40 C) + +/obj/item/clothing/suit/storage/toggle/konyang/dbjacket/black + desc = "Styled after the latest fashion trends on Konyang, this hybrid faux-leather and polyester mesh jacket was built with the planet’s humid climate in mind. This one has a deep black color." + icon_state = "konyang_coat_black" + item_state = "konyang_coat_black" + +/obj/item/clothing/suit/storage/toggle/konyang/dbjacket/blue + desc = "Styled after the latest fashion trends on Konyang, this hybrid faux-leather and polyester mesh jacket was built with the planet’s humid climate in mind. This one has an irisdescent blue color." + icon_state = "konyang_coat_iridescent" + item_state = "konyang_coat_iridescent" + /obj/item/clothing/head/konyang name = "gat" desc = "A traditional hat worn on Konyang and originating on Earth." @@ -161,4 +182,4 @@ 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 + item_state = "konyang_dress_traditional_national_vest" diff --git a/code/modules/clothing/suits/storage.dm b/code/modules/clothing/suits/storage.dm index 7d14ee2573e..773e6762188 100644 --- a/code/modules/clothing/suits/storage.dm +++ b/code/modules/clothing/suits/storage.dm @@ -174,4 +174,4 @@ /obj/item/clothing/suit/storage/toggle/corp/scc/alt icon_state = "scc_corp_jacket_alt" - item_state = "scc_corp_jacket_alt" \ No newline at end of file + item_state = "scc_corp_jacket_alt" diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index de2cb8d7ecd..5f39d3b8a71 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -2100,4 +2100,13 @@ All custom items with worn sprites must follow the contained sprite system: http icon_override = 'icons/obj/custom_items/schlosser_hat.dmi' icon_state = "schlosser_hat" item_state = "schlosser_hat" - contained_sprite = TRUE \ No newline at end of file + contained_sprite = TRUE + +/obj/item/clothing/suit/storage/toggle/konyang/dbjacket/provenance_jacket // Double-Breasted Cropped Jacket - Z.I Provenance - niennab + name = "double-breasted cropped jacket" + desc = "Styled after the latest fashion trends on Konyang, this hybrid leather and polyester mesh jacket was built with the planet’s humid climate in mind. This particular jacket appears to be emblematic of Konyang's stylings but hand-made, sporting a distinctive fur collar." + icon = 'icons/obj/custom_items/provenance_jacket.dmi' + icon_override = 'icons/obj/custom_items/provenance_jacket.dmi' + icon_state = "provenance_coat" + item_state = "provenance_coat" + diff --git a/html/changelogs/GeneralCamo - Konyanger Jacket.yml b/html/changelogs/GeneralCamo - Konyanger Jacket.yml new file mode 100644 index 00000000000..984817c945a --- /dev/null +++ b/html/changelogs/GeneralCamo - Konyanger Jacket.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: GeneralCamo + +# 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 a new double-breasted Konyanger jacket, with minor heat protection. Sprites by Niennab." diff --git a/icons/clothing/suits/konyang_double_breasted_jacket.dmi b/icons/clothing/suits/konyang_double_breasted_jacket.dmi new file mode 100644 index 00000000000..8ee41e97114 Binary files /dev/null and b/icons/clothing/suits/konyang_double_breasted_jacket.dmi differ diff --git a/icons/obj/custom_items/provenance_jacket.dmi b/icons/obj/custom_items/provenance_jacket.dmi new file mode 100644 index 00000000000..cddd5641aa5 Binary files /dev/null and b/icons/obj/custom_items/provenance_jacket.dmi differ