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 27577289443..29f62e74b77 100644 Binary files a/icons/obj/item/clothing/accessory/dogtags.dmi and b/icons/obj/item/clothing/accessory/dogtags.dmi differ