From 82a498580532ee67d82df47ca97f7debb75e503e Mon Sep 17 00:00:00 2001 From: feartheblackout <59633984+feartheblackout@users.noreply.github.com> Date: Mon, 27 Feb 2023 09:27:02 -0600 Subject: [PATCH] Adds a necklace to the loadout (#15870) Co-authored-by: Gabby --- .../loadout/loadout_accessories.dm | 6 +++ .../clothing/under/accessories/accessory.dm | 10 ++++- html/changelogs/SimpleMaroon-necklass.yml | 41 ++++++++++++++++++ .../obj/item/clothing/accessory/necklace.dmi | Bin 0 -> 734 bytes 4 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/SimpleMaroon-necklass.yml create mode 100644 icons/obj/item/clothing/accessory/necklace.dmi diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index 4dfd546e2ea..acd9a19a286 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -589,3 +589,9 @@ var/obj/item/clothing/accessory/temperature/temp_pack = temp_path temperature[initial(temp_pack.name)] = temp_path gear_tweaks += new /datum/gear_tweak/path(temperature) + +/datum/gear/accessory/necklace + display_name = "necklace (colorable)" + description = "A piece of jewelry that goes around your neck." + path = /obj/item/clothing/accessory/necklace + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index f3a78196916..4250aa8f491 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -223,6 +223,14 @@ icon_state = "bow_tie" item_state = "bow_tie" +/obj/item/clothing/accessory/necklace + name = "necklace" + desc = "A piece of jewelry that goes around your neck." + icon = 'icons/obj/item/clothing/accessory/necklace.dmi' + icon_state = "necklace" + item_state = "necklace" + contained_sprite = TRUE + /obj/item/clothing/accessory/stethoscope name = "stethoscope" desc = "An outdated medical apparatus for listening to the sounds of the human body. It also makes you look like you know what you're doing." @@ -1229,4 +1237,4 @@ desc = "A denim overall skirt with a high back." icon_state = "overall_skirt_x" item_state = "overall_skirt_x" -/********** Overalls End **********/ \ No newline at end of file +/********** Overalls End **********/ diff --git a/html/changelogs/SimpleMaroon-necklass.yml b/html/changelogs/SimpleMaroon-necklass.yml new file mode 100644 index 00000000000..e6d18757ca7 --- /dev/null +++ b/html/changelogs/SimpleMaroon-necklass.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: SimpleMaroon + +# 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: "Added a generic, colorable necklace to the loadout." diff --git a/icons/obj/item/clothing/accessory/necklace.dmi b/icons/obj/item/clothing/accessory/necklace.dmi new file mode 100644 index 0000000000000000000000000000000000000000..7294a883a2e3abd21f351aba115c370f060f2bd4 GIT binary patch literal 734 zcmeAS@N?(olHy`uVBq!ia0vp^2|(9Tvex-CaN-o}Ct#yM&5^6?1r6KQ680*s7+HHB~g`Z;VJx zjqOf`HQX9eMOBO{3=B-No-U3d6?5L+w#{yKU^w=1bIGJF4+6Z@C(fR%^PQ3DYqIte z<{c(;`3tp{9(EMk6xaT2(v~e>d-VO2=igUSbULzM{Og5;oiSX8b~@!Bs6Wn-z{7A1 znYg}B`=0%sn+80W@8(Ufjor6z4{L4SlNpul9ES~bOQ&)x-Z^KdBP?mZOW}8E)zT@O zTmxC`Yv0YDa>*@FrN{7)?$&GRfA^I$D7vWiS^pIlSDU!eH|0(>OY)iZ^M9AUJNM6T za_SO*L+gcC-Dnol751>aSTI*s$M>>)3-izZT~mv|aqW3G zYqHF5msT0?JR9bJKK?(K1(VI(TJ=3uReWBtPiMcintOJ+*~E{JPhOW{oEPQqI%U_X z@5&0+od*OTtlYeFK~Q)*hw~lo9@piQ3*Wi*gggF|n&0xerr2p&e1Vlz590v|1~g*L zXX}UFn_0Dv8kmT%UCXq?{m8_Bhs?HI%+fnyt0d<-QR0_j;nFFl$9Vqjj?K1} zd@d(AJ&5nyq9YRbxC^YT*?E4h`3GWF2(cwI7_c!AK~%GI`Rp-2dt-qCFu^i-y85}S Ib4q9e0128d;Q#;t literal 0 HcmV?d00001