From edb1c0817832780b2651ca831d5c6ad25e229e23 Mon Sep 17 00:00:00 2001 From: Casper3667 <8396443+Casper3667@users.noreply.github.com> Date: Sat, 29 Jan 2022 05:07:36 +0100 Subject: [PATCH] Adds the zeng-hu jargon division cloak and a custom item (#12931) Co-authored-by: TGW --- .../preference_setup/loadout/loadout_factions.dm | 6 ++++++ .../clothing/under/accessories/accessory.dm | 13 +++++++++++++ code/modules/customitems/item_defines.dm | 8 ++++++++ html/changelogs/ZengCloak.yml | 6 ++++++ icons/obj/contained_items/accessories/zh_cape.dmi | Bin 0 -> 487 bytes icons/obj/custom_items/eden_cloak.dmi | Bin 0 -> 494 bytes 6 files changed, 33 insertions(+) create mode 100644 html/changelogs/ZengCloak.yml create mode 100644 icons/obj/contained_items/accessories/zh_cape.dmi create mode 100644 icons/obj/custom_items/eden_cloak.dmi diff --git a/code/modules/client/preference_setup/loadout/loadout_factions.dm b/code/modules/client/preference_setup/loadout/loadout_factions.dm index 66be6ca418f..23cbcbd1593 100644 --- a/code/modules/client/preference_setup/loadout/loadout_factions.dm +++ b/code/modules/client/preference_setup/loadout/loadout_factions.dm @@ -216,6 +216,12 @@ slot = slot_gloves faction = "Zeng-Hu Pharmaceuticals" +/datum/gear/faction/zenghu_cloak + display_name = "Zeng-Hu Jargon Division cloak" + path = /obj/item/clothing/accessory/poncho/shouldercape/qeblak/zeng + slot = slot_wear_suit + faction = "Zeng-Hu Pharmaceuticals" + /datum/gear/faction/zavodskoi_patch display_name = "zavodskoi sleeve patch" path = /obj/item/clothing/accessory/sleevepatch/zavodskoi diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 4f3a7bb0476..f4da7a767ce 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -573,6 +573,19 @@ item_state = "qeblak_cape" flippable = FALSE +/obj/item/clothing/accessory/poncho/shouldercape/qeblak/zeng + name = "Jargon Division Zeng-Hu cloak" + desc = "This cloak is given to Zeng-Hu employees who have assisted or worked in collaboration with the Jargon Federation." + desc_fluff = "A cloak given to senior level doctors and researchers for Zeng-Hu who has \ + in the past been given the privilege of working within or in collaboration with the Jargon Federation\ + as a show of goodwill between the corporation and federation." + icon = 'icons/obj/contained_items/accessories/ZH_cape.dmi' + icon_override = 'icons/obj/contained_items/accessories/ZH_cape.dmi' + icon_state = "ZH_cape" + item_state = "ZH_cape" + flippable = FALSE + contained_sprite = TRUE + /obj/item/clothing/accessory/poncho/trinary name = "trinary perfection cape" desc = "A brilliant red and brown cape, commonly worn by those who serve the Trinary Perfection." diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 809ab587120..64bbdf84294 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -2380,3 +2380,11 @@ All custom items with worn sprites must follow the contained sprite system: http if(has_suit) has_suit.verbs -= /obj/item/clothing/accessory/poncho/tajarancloak/fluff/kathira_cloak/verb/change_cloak ..() + +/obj/item/clothing/accessory/poncho/shouldercape/qeblak/zeng/fluff/eden_cloak // Zeng-Hu Jargon division cloak - Eden Li - Huntime + name = "Zeng-Hu cloak: Jargon Division" + desc = "A cloak worn by Zeng-Hu personnel who worked with or in the Jargon Federation." + icon = 'icons/obj/custom_items/eden_cloak.dmi' + icon_override = 'icons/obj/custom_items/eden_cloak.dmi' + icon_state = "ZH_cape_custom" + item_state = "ZH_cape_custom" diff --git a/html/changelogs/ZengCloak.yml b/html/changelogs/ZengCloak.yml new file mode 100644 index 00000000000..cd46733c53c --- /dev/null +++ b/html/changelogs/ZengCloak.yml @@ -0,0 +1,6 @@ +author: TheGreyWolf + +delete-after: True + +changes: + - rscadd: "Added the zeng-hu jargon division cloak to the loadout under factions." diff --git a/icons/obj/contained_items/accessories/zh_cape.dmi b/icons/obj/contained_items/accessories/zh_cape.dmi new file mode 100644 index 0000000000000000000000000000000000000000..883019e213529d813fb74887995cf03767fbb2bc GIT binary patch literal 487 zcmV+9Is+lpVRrmC%$c(kyO$YMZyH76a500001bW%=J06^y0W&i*Hd3sb>bVOxyV{&P5 zbZKvH004NLQ&w@#Ek%UZ=*|<^XEeiQR&Ftp$0hoWHX#u+EygP%C6(5d$*U2`Vhh@FmQ`v8%l%wp! zfMo(urs#wA!nO_5`>dw$&G|4p=Qihpkbrz){R_{fbU)*3BS%{tknx4Jwmcx`E2Sy} zXrEyi=F>E7RY~*02Y^f#pN_XX$_pO=gIeSJH)Wy#N%O)h1KO%bJFR1>2 d;eNn;0WVS6G+h@#Hs$~T002ovPDHLkV1nyA(?|dS literal 0 HcmV?d00001 diff --git a/icons/obj/custom_items/eden_cloak.dmi b/icons/obj/custom_items/eden_cloak.dmi new file mode 100644 index 0000000000000000000000000000000000000000..db9138599fa1c3b14d26f9b3ee7154ce06f11aa7 GIT binary patch literal 494 zcmV$1lr-T(jq0d!JMQvg8b*k%9#0D*c`Sad{Xb7OL8aCB*J zZU6vyoKseCa&`CgQ*iP1U@w74WcSBZ-=C9|j)C}GIOnO2mTn+jp$P##}giqK&~l#bFo zTso8$T>V_YegFWkW;~L0BzMUjWp% zHT@vAF)c+L(R=^nzVkukikT)1!!W-C$_IpBpnO3219_R k4@keD@&ktR0rLgC034Gu$U)BUAOHXW07*qoM6N<$f?W{TQ2+n{ literal 0 HcmV?d00001