From cbbb927654dfc94199a7f98ea6bff053859ab2a3 Mon Sep 17 00:00:00 2001 From: FearTheGabby Date: Tue, 25 Feb 2025 11:52:11 -0600 Subject: [PATCH] Quality-of-life changes to dogtag accessories (#20396) see changelog or the video below https://github.com/user-attachments/assets/d20d1a1b-f147-406c-aa3d-2dc5a310c38c --------- Co-authored-by: Gabby <59633984+feartheblackout@users.noreply.github.com> --- .../loadout/items/accessories.dm | 1 + code/modules/clothing/factions/gadpathur.dm | 2 - .../clothing/under/accessories/accessory.dm | 27 ++++++-- .../SimpleMaroon-dogtagspritefix.yml | 60 ++++++++++++++++++ icons/obj/item/clothing/accessory/dogtags.dmi | Bin 1497 -> 2349 bytes 5 files changed, 83 insertions(+), 7 deletions(-) create mode 100644 html/changelogs/SimpleMaroon-dogtagspritefix.yml diff --git a/code/modules/client/preference_setup/loadout/items/accessories.dm b/code/modules/client/preference_setup/loadout/items/accessories.dm index ef57afa39bc..cf7ba01bade 100644 --- a/code/modules/client/preference_setup/loadout/items/accessories.dm +++ b/code/modules/client/preference_setup/loadout/items/accessories.dm @@ -257,6 +257,7 @@ ABSTRACT_TYPE(/datum/gear/accessory) /datum/gear/accessory/dogtags display_name = "dogtags" path = /obj/item/clothing/accessory/dogtags + description = "A pair of engraved metal identification tags. The description you assign to the dogtags will carry over to both tags when separated." /datum/gear/accessory/holobadge display_name = "badge, holographic" diff --git a/code/modules/clothing/factions/gadpathur.dm b/code/modules/clothing/factions/gadpathur.dm index 83c0c254095..94cd0a063ba 100644 --- a/code/modules/clothing/factions/gadpathur.dm +++ b/code/modules/clothing/factions/gadpathur.dm @@ -156,9 +156,7 @@ name = "gadpathurian dogtag" desc = "Gadpathurian dogtags are issued to every non-exiled member of the planet's highly-militarized society and list their wearer's name, cadre, cadre ID, religion, and blood type. \ They can be easily ripped in half in the event of the wearer's death." - icon = 'icons/obj/item/clothing/accessory/dogtags.dmi' icon_state = "gadpathur_tag" - w_class = WEIGHT_CLASS_SMALL /obj/item/clothing/mask/breath/gadpathur name = "gadpathurian rebreather" diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index d849657fcb6..f37328d7ec4 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -891,9 +891,19 @@ overlay_state = "tags" drop_sound = 'sound/items/drop/accessory.ogg' pickup_sound = 'sound/items/pickup/accessory.ogg' - var/can_be_broken = FALSE + desc_extended = "Use the dogtags on help intent to tuck or untuck them, or on harm intent to separate them." + var/can_be_broken = TRUE var/separated = FALSE var/tag_type = /obj/item/dogtag + /// If tucked is true, sprite is invisible on the mob; if false, it shows up as normal + var/tucked = TRUE + +/obj/item/dogtag + name = "dogtag" + desc = "An engraved metal identification tag." + icon = 'icons/obj/item/clothing/accessory/dogtags.dmi' + icon_state = "tag" + w_class = WEIGHT_CLASS_TINY /obj/item/clothing/accessory/dogtags/get_mask_examine_text(mob/user) return "around [user.get_pronoun("his")] neck" @@ -906,16 +916,23 @@ separated = TRUE var/obj/item/dogtag/tag = new tag_type(get_turf(user)) user.put_in_hands(tag) + tag.desc = desc separated = TRUE update_icon() + if(user.a_intent == I_HELP) + if(ishuman(user)) + var/mob/living/carbon/human/H = user + to_chat(user, SPAN_NOTICE("You [tucked ? "untuck" : "tuck"] \the [src] [tucked ? "from" : "under"] your [H.w_uniform.name].")) + tucked = !tucked + update_icon() /obj/item/clothing/accessory/dogtags/update_icon() if(separated) - icon_state = "[icon_state]_single" - item_state = "[item_state]_single" + icon_state = "[initial(icon_state)]_single[tucked ? "_tucked" : ""]" + item_state = "[initial(item_state)]_single[tucked ? "_tucked" : ""]" else - icon_state = initial(icon_state) - item_state = initial(item_state) + icon_state = "[initial(icon_state)][tucked ? "_tucked" : ""]" + item_state = "[initial(item_state)][tucked ? "_tucked" : ""]" /obj/item/clothing/accessory/badge/namepin name = "pin tag" diff --git a/html/changelogs/SimpleMaroon-dogtagspritefix.yml b/html/changelogs/SimpleMaroon-dogtagspritefix.yml new file mode 100644 index 00000000000..1b42b07dddf --- /dev/null +++ b/html/changelogs/SimpleMaroon-dogtagspritefix.yml @@ -0,0 +1,60 @@ +################################ +# 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: 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, 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: "Dogtags accessory items can now be tucked or untucked on help intent, meaning the sprite will not show up when worn as an accessory when tucked." + - rscadd: "All three existing variants of dogtags (regular, Gadpathurian, Adhomian) can now be separated, instead of just the Gadpathurian and Adhomian tags." + - rscadd: "The description assigned to your dogtags will now be assigned to both individual tags on separation." diff --git a/icons/obj/item/clothing/accessory/dogtags.dmi b/icons/obj/item/clothing/accessory/dogtags.dmi index 27577289443321e243bf0a536bbd5734146def6f..29f62e74b779636d86b866d13a005c7341bea824 100644 GIT binary patch literal 2349 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