From f05b9881c2c98e76a2a2f7a158c381c8fb9713d4 Mon Sep 17 00:00:00 2001 From: RustingWithYou <63625389+RustingWithYou@users.noreply.github.com> Date: Wed, 11 Oct 2023 01:51:24 +1300 Subject: [PATCH] Konyang: Uniforms (#17541) * konyang uniforms * lieutenant uniform * sprite names --- code/modules/clothing/head/misc.dm | 73 ++++++++++++++++++ code/modules/clothing/under/miscellaneous.dm | 61 +++++++++++++++ .../RustingWithYou - konyangdrip.yml | 41 ++++++++++ .../under/uniforms/konyang_uniforms.dmi | Bin 0 -> 8436 bytes 4 files changed, 175 insertions(+) create mode 100644 html/changelogs/RustingWithYou - konyangdrip.yml create mode 100644 icons/clothing/under/uniforms/konyang_uniforms.dmi 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 0000000000000000000000000000000000000000..7a6c47da281e6fe894f115e8f3e01279723f6d71 GIT binary patch literal 8436 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