From 457e57a1006b262f32561bfa0d0eda7979fcb995 Mon Sep 17 00:00:00 2001 From: ASmallCuteCat Date: Mon, 1 Jul 2024 05:07:34 -0400 Subject: [PATCH] Adds a shawl (#19449) Adds a colorable shawl to the loadout, as well as the ability to knit one. Oppa grandma style. Sprites by ASmallCuteCat (aka Revenant1367 --- code/game/objects/items/knitting.dm | 2 +- .../loadout/items/accessories.dm | 5 ++ .../clothing/under/accessories/accessory.dm | 8 +++ .../ASmallCuteCat - colorable shawl.yml | 58 ++++++++++++++++++ icons/obj/clothing/shawl.dmi | Bin 0 -> 438 bytes 5 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/ASmallCuteCat - colorable shawl.yml create mode 100644 icons/obj/clothing/shawl.dmi diff --git a/code/game/objects/items/knitting.dm b/code/game/objects/items/knitting.dm index a9bd95ed35c..682bbc48fb1 100644 --- a/code/game/objects/items/knitting.dm +++ b/code/game/objects/items/knitting.dm @@ -8,7 +8,7 @@ contained_sprite = TRUE var/working = FALSE var/obj/item/yarn/ball - var/static/list/knitables = list(/obj/item/clothing/accessory/sweater, /obj/item/clothing/suit/storage/toggle/cardigan, /obj/item/clothing/suit/storage/toggle/cardigan/sweater, /obj/item/clothing/suit/storage/toggle/cardigan/argyle, /obj/item/clothing/accessory/sweater/vest, /obj/item/clothing/accessory/sweater/turtleneck, /obj/item/clothing/gloves/fingerless/colour/knitted, /obj/item/clothing/gloves/knitted, /obj/item/clothing/accessory/bandanna/colorable/knitted, /obj/item/clothing/accessory/scarf) + var/static/list/knitables = list(/obj/item/clothing/accessory/sweater, /obj/item/clothing/suit/storage/toggle/cardigan, /obj/item/clothing/suit/storage/toggle/cardigan/sweater, /obj/item/clothing/suit/storage/toggle/cardigan/argyle, /obj/item/clothing/accessory/sweater/vest, /obj/item/clothing/accessory/sweater/turtleneck, /obj/item/clothing/gloves/fingerless/colour/knitted, /obj/item/clothing/gloves/knitted, /obj/item/clothing/accessory/bandanna/colorable/knitted, /obj/item/clothing/accessory/scarf, /obj/item/clothing/accessory/shawl) var/static/list/name2knit /obj/item/knittingneedles/verb/remove_yarn() diff --git a/code/modules/client/preference_setup/loadout/items/accessories.dm b/code/modules/client/preference_setup/loadout/items/accessories.dm index 971ce5cf4dc..95c753f1f91 100644 --- a/code/modules/client/preference_setup/loadout/items/accessories.dm +++ b/code/modules/client/preference_setup/loadout/items/accessories.dm @@ -335,6 +335,11 @@ scarfs["zebra scarf"] = /obj/item/clothing/accessory/scarf/zebra gear_tweaks += new /datum/gear_tweak/path(scarfs) +/datum/gear/accessory/shawl + display_name = "colorable shawl" + path = /obj/item/clothing/accessory/shawl + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + /datum/gear/accessory/dogtags display_name = "dogtags" path = /obj/item/clothing/accessory/dogtags diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 316cd7b2934..c311073fc01 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -361,6 +361,14 @@ build_from_parts = TRUE worn_overlay = "stripes" +/obj/item/clothing/accessory/shawl + name = "cozy shawl" + desc = "A favored accessory amongst grandmothers and cottagecore enthusiasts." + icon = 'icons/obj/clothing/shawl.dmi' + icon_state = "shawl" + item_state = "shawl" + contained_sprite = TRUE + /obj/item/clothing/accessory/chaps name = "brown chaps" desc = "A pair of loose, brown leather chaps." diff --git a/html/changelogs/ASmallCuteCat - colorable shawl.yml b/html/changelogs/ASmallCuteCat - colorable shawl.yml new file mode 100644 index 00000000000..a2315e2b82a --- /dev/null +++ b/html/changelogs/ASmallCuteCat - colorable shawl.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: ASmallCuteCat + +# 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: + - imageadd: "Adds a colorable shawl to the loadout." diff --git a/icons/obj/clothing/shawl.dmi b/icons/obj/clothing/shawl.dmi new file mode 100644 index 0000000000000000000000000000000000000000..79b08dbd639eb021e7a70e99153070a6c27c9e25 GIT binary patch literal 438 zcmV;n0ZIOeP)V=-0C=2J zR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5 zsW>CCJSV<1Pl<~&C9|j)q>qa;ttc@!6~s0~Q;1Myh@wha!PUFE^$M&;62~d&klz!lp2LA-+ z=e4t3Q(EUkdCJNe%DSGgu4|Ey=n$$ZwZ5bP5Zqc~fwyOhNfi5t3|k6_wnb2zJ&7t( zw)<-YgoH`jK8h&RZSaw0xw}EJO%OJNx^bJ-KkSVVJ}J?!_-r49&v(FLN_5c}fDQ4O&#jvS{Q g5V?M87z}>P9S-CdJa%HwxBvhE07*qoM6N<$f`Lc6_W%F@ literal 0 HcmV?d00001