From 17d970d73e42e951fa0d1b5d8937e1a8f5930974 Mon Sep 17 00:00:00 2001 From: DreamySkrell <107256943+DreamySkrell@users.noreply.github.com> Date: Wed, 2 Nov 2022 17:46:07 +0100 Subject: [PATCH] Accent tags clickable, show name and desc in new window (#14995) --- code/modules/mob/mob.dm | 13 +++++++++++++ code/modules/mob/mob_helpers.dm | 4 ++-- html/changelogs/DreamySkrell-accent-tag-35.yml | 7 +++++++ 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/DreamySkrell-accent-tag-35.yml diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 77d25f4938e..42731b1c309 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -689,6 +689,19 @@ var/datum/browser/flavor_win = new(usr, name, capitalize_first_letters(name), 500, 250) flavor_win.set_content(replacetext(flavor_text, "\n", "
")) flavor_win.open() + + if(href_list["accent_tag"]) + var/datum/accent/accent = SSrecords.accents[href_list["accent_tag"]] + if(accent && istype(accent)) + var/datum/browser/accent_win = new(usr, accent.name, capitalize_first_letters(accent.name), 500, 250) + var/html = "[accent.description]
" + var/datum/asset/spritesheet/S = get_asset_datum(/datum/asset/spritesheet/goonchat) + html += "[S.css_tag()]
" + html += {"[S.icon_tag(accent.tag_icon)]
"} + html += "([accent.text_tag])
" + accent_win.set_content(html) + accent_win.open() + if(href_list["flavor_change"]) update_flavor_text() diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 1b4af238663..7a9d5d6ec3d 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -1193,11 +1193,11 @@ proc/is_blind(A) var/datum/accent/a = SSrecords.accents[used_accent] if(istype(a)) if(hearer && hearer.client && hearer.client.prefs?.toggles_secondary & ACCENT_TAG_TEXT) - return "([a.text_tag])" + return {"([a.text_tag])"} else var/final_icon = a.tag_icon var/datum/asset/spritesheet/S = get_asset_datum(/datum/asset/spritesheet/goonchat) - return S.icon_tag(final_icon) + return {"[S.icon_tag(final_icon)]"} /mob/proc/flash_eyes(intensity = FLASH_PROTECTION_MODERATE, override_blindness_check = FALSE, affect_silicon = FALSE, visual = FALSE, type = /obj/screen/fullscreen/flash) diff --git a/html/changelogs/DreamySkrell-accent-tag-35.yml b/html/changelogs/DreamySkrell-accent-tag-35.yml new file mode 100644 index 00000000000..bcf01b350a0 --- /dev/null +++ b/html/changelogs/DreamySkrell-accent-tag-35.yml @@ -0,0 +1,7 @@ + +author: DreamySkrell + +delete-after: True + +changes: + - rscadd: "Accent tags in the chat are now clickable, and show a window with the accent name and description."