diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index 6dc5554d1a8..2627d2569dc 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -73,6 +73,7 @@ S.name = name S.desc = desc S.icon_state = sign_state + S.icon = icon S.sign_type = src.type to_chat(user, "You fasten \the [S] with your [attacking_item].") qdel(src) diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index b219c250e55..fca241136a8 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -1412,3 +1412,21 @@ All custom items with worn sprites must follow the contained sprite system: http icon_override = 'icons/obj/custom_items/kalkii_coat.dmi' icon_state = "kalkii_coat" item_state = "kalkii_coat" + +/obj/item/clothing/accessory/poncho/fluff/zzzhao_greatcoat // Z.Z. Zhao's Epauleted Greatcoat - Zhong-Zheng Zhao - Wowzewow + name = "epauleted greatcoat" + desc = "A normal greatcoat with a rather dated Parade accessory attached, long decommissioned. Brings a warm nostalgia to some, confusion to others. \ + It seems to be freshly pressed and starched." + icon = 'icons/obj/custom_items/zzzhao_greatcoat.dmi' + icon_override = 'icons/obj/custom_items/zzzhao_greatcoat.dmi' + icon_state = "epauleted_greatcoat" + item_state = "epauleted_greatcoat" + +/obj/item/sign/fluff/zzzhao_painting // Z.Z. Zhao's Self Portrait - Zhong-Zheng Zhao - Wowzewow + name = "portrait of a Zhao" + desc = "A painted portrait of a Zhurongian Dominian man labelled as 'Z.Z. Zhao' Seems imposing." + icon = 'icons/obj/custom_items/zzzhao_painting.dmi' + icon_state = "zzzhao_painting" + item_state = "zzzhao_painting" + sign_state = "zzzhao_painting" + w_class = WEIGHT_CLASS_NORMAL diff --git a/html/changelogs/wezzy-zzzhaoitems.yml b/html/changelogs/wezzy-zzzhaoitems.yml new file mode 100644 index 00000000000..5c09ef52e75 --- /dev/null +++ b/html/changelogs/wezzy-zzzhaoitems.yml @@ -0,0 +1,58 @@ +################################ +# 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 +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Wowzewow (Wezzy) + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds Z.Z. Zhao's custom items." diff --git a/icons/obj/custom_items/zzzhao_greatcoat.dmi b/icons/obj/custom_items/zzzhao_greatcoat.dmi new file mode 100644 index 00000000000..f95611c06b8 Binary files /dev/null and b/icons/obj/custom_items/zzzhao_greatcoat.dmi differ diff --git a/icons/obj/custom_items/zzzhao_painting.dmi b/icons/obj/custom_items/zzzhao_painting.dmi new file mode 100644 index 00000000000..e085d915274 Binary files /dev/null and b/icons/obj/custom_items/zzzhao_painting.dmi differ