diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 756ad078e0f..d9b3a3decc3 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -610,3 +610,76 @@ desc = "A green campaign hat issued as part of Solarian Army service uniforms. The NCOs that scream at you more than the normal ones should wear this." icon_state = "army_campaign" item_state = "army_campaign" + +//Konyang Armed Forces + +/obj/item/clothing/head/konyang/army + name = "konyang army field cap" + desc = "A cloth field cap issued to Konyang soldiers as part of their field uniform." + icon = 'icons/clothing/under/uniforms/konyang_uniforms.dmi' + icon_state = "konyang_army_cap" + item_state = "konyang_army_cap" + contained_sprite = TRUE + +/obj/item/clothing/head/konyang/army/officer + name = "konyang army officer peaked cap" + desc = "A green peaked cap issued to officers of the Konyang Army." + icon_state = "konyang_army_off_cap" + item_state = "konyang_army_off_cap" + +/obj/item/clothing/head/konyang/navy + name = "konyang navy officer peaked cap" + desc = "A white peaked cap issued to officers of the Konyang Navy." + icon = 'icons/clothing/under/uniforms/konyang_uniforms.dmi' + icon_state = "konyang_navy_cap" + item_state = "konyang_navy_cap" + contained_sprite = TRUE + +/obj/item/clothing/head/konyang/space + name = "konyang aerospace forces officer peaked cap" + desc = "A white peaked cap issued to officers of the Konyang Aerospace Forces." + icon = 'icons/clothing/under/uniforms/konyang_uniforms.dmi' + icon_state = "konyang_space_cap" + item_state = "konyang_space_cap" + contained_sprite = TRUE + +/obj/item/clothing/head/konyang/police + name = "konyang national police hat" + desc = "A white peaked cap issued to personnel of the Konyang National Police" + icon = 'icons/clothing/under/uniforms/konyang_uniforms.dmi' + icon_state = "konyang_police_hat" + item_state = "konyang_police_hat" + contained_sprite = TRUE + +/obj/item/clothing/head/konyang/police/lieutenant + name = "konyang national police lieutenant's hat" + desc = "A white peaked cap issued to personnel of the Konyang National Police" + icon_state = "konyang_police_lieutenant_hat" + item_state = "konyang_police_lieutenant_hat" + +/obj/item/clothing/head/helmet/konyang + name = "konyang army helmet" + desc = "A woodland colored helmet made from advanced ceramic." + icon = 'icons/clothing/under/uniforms/konyang_uniforms.dmi' + icon_state = "helmet_konyang_army" + item_state = "helmet_konyang_army" + armor = list( + melee = ARMOR_MELEE_MAJOR, + bullet = ARMOR_BALLISTIC_MEDIUM, + laser = ARMOR_LASER_RIFLE, + energy = ARMOR_ENERGY_SMALL, + bomb = ARMOR_BOMB_PADDED + ) + contained_sprite = TRUE + +/obj/item/clothing/head/helmet/konyang/navy + name = "konyang navy helmet" + desc = "A pale blue colored helmet made from advanced ceramic." + icon_state = "helmet_konyang_navy" + item_state = "helmet_konyang_navy" + +/obj/item/clothing/head/helmet/konyang/pilot + name = "konyang mechatronic corps helmet" + desc = "A white colored helmet made from advanced ceramic." + icon_state = "helmet_pilot" + item_state = "helmet_pilot" diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index baf92563d88..0b93cdef7f5 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -626,3 +626,64 @@ desc = "An utility uniform worn by Elyran navy officers serving aboard ships and in the field." icon_state = "elyran_commander" item_state = "elyran_commander" + +/obj/item/clothing/under/rank/konyang + name = "konyang army uniform" + desc = "A set of dark green fatigues issued to the soldiers of the Konyang Army. Its design is similar to the uniforms of the Solarian Army." + icon = 'icons/clothing/under/uniforms/konyang_uniforms.dmi' + icon_state = "konyang_army" + item_state = "konyang_army" + contained_sprite = TRUE + armor = list( + melee = ARMOR_MELEE_SMALL, + bullet = ARMOR_BALLISTIC_MINOR, + laser = ARMOR_LASER_MINOR + ) + +/obj/item/clothing/under/rank/konyang/officer + name = "konyang army officer's uniform" + desc = "A green service uniform worn by the officers of the Konyang Army. Its design is similar to the uniforms of the Solarian Army" + icon_state = "konyang_army_officer" + item_state = "konyang_army_officer" + +/obj/item/clothing/under/rank/konyang/navy + name = "konyang navy uniform" + desc = "A blue utility uniform worn by the enlisted personnel of the Konyang Navy - often derided as more of a coast guard than a true armed force." + icon_state = "konyang_navy" + item_state = "konyang_navy" + +/obj/item/clothing/under/rank/konyang/navy/officer + name = "konyang navy officer's uniform" + desc = "A white service uniform worn by the officers of the Konyang Navy - often derided as more of a coast guard than a true armed force." + icon_state = "konyang_navy_officer" + item_state = "konyang_navy_officer" + +/obj/item/clothing/under/rank/konyang/space + name = "konyang aerospace force uniform" + desc = "A set of black coveralls worn by the soldiers of the Konyang Aerospace Forces, whether on-ship or in the field." + icon_state = "konyang_space" + item_state = "konyang_space" + +/obj/item/clothing/under/rank/konyang/space/officer + name = "konyang aerospace force officer's uniform" + desc = "A military service uniform issued to officers of the Konyang Aerospace Forces." + icon_state = "konyang_space_officer" + item_state = "konyang_space_officer" + +/obj/item/clothing/under/rank/konyang/mech_pilot + name = "konyang mechatronic corps jumpsuit" + desc = "A sky-blue jumpsuit worn by the exosuit pilots of the Konyang Army Mechatronic Corps - an elite exosuit unit that is often deployed abroad." + icon_state = "mech_pilot" + item_state = "mech_pilot" + +/obj/item/clothing/under/rank/konyang/police + name = "konyang national police uniform" + desc = "A white shirt and blue tie, bearing the insignia of the Konyang National Police on the shoulders." + icon_state = "police" + item_state = "police" + +/obj/item/clothing/under/rank/konyang/police/lieutenant + name = "konyang national police lieutenant's uniform" + desc = "A white shirt and blue tie, bearing the insignia of the Konyang National Police on the shoulders. This one is emblazoned with red, marking the wearer as a lieutenant." + icon_state = "konyang_police_lieutenant" + item_state = "konyang_police_lieutenant" diff --git a/html/changelogs/RustingWithYou - konyangdrip.yml b/html/changelogs/RustingWithYou - konyangdrip.yml new file mode 100644 index 00000000000..78e419cec8b --- /dev/null +++ b/html/changelogs/RustingWithYou - konyangdrip.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: RustingWithYou + +# 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 uniforms for various branches of the Konyang Armed Forces." diff --git a/icons/clothing/under/uniforms/konyang_uniforms.dmi b/icons/clothing/under/uniforms/konyang_uniforms.dmi new file mode 100644 index 00000000000..7a6c47da281 Binary files /dev/null and b/icons/clothing/under/uniforms/konyang_uniforms.dmi differ