diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 74028a42d08..14f8215483a 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -934,3 +934,9 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out. /obj/item/proc/get_belt_overlay() //Returns the icon used for overlaying the object on a belt return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', icon_state) + +/obj/item/proc/get_ear_examine_text(var/mob/user, var/ear_text = "left") + return "on [user.get_pronoun("his")] [ear_text] ear" + +/obj/item/proc/get_mask_examine_text(var/mob/user) + return "on [user.get_pronoun("his")] face" \ No newline at end of file diff --git a/code/game/objects/items/tajara.dm b/code/game/objects/items/tajara.dm index 3ef88f94bc2..00180ee396a 100644 --- a/code/game/objects/items/tajara.dm +++ b/code/game/objects/items/tajara.dm @@ -135,8 +135,12 @@ icon_state = "adhomai_clock" item_state = "adhomai_clock" contained_sprite = TRUE + slot_flags = SLOT_MASK var/static/months = list("Menshe-aysaif", "Sil'nryy-aysaif", "Menshe-rhazzimy", "Sil'nryy-rhazzimy") +/obj/item/pocketwatch/adhomai/get_mask_examine_text(mob/user) + return "around [user.get_pronoun("his")] neck" + /obj/item/pocketwatch/adhomai/checktime(mob/user) set category = "Object" set name = "Check Time" diff --git a/code/modules/clothing/ears/bandanna.dm b/code/modules/clothing/ears/bandanna.dm index 4d566f4f178..38e9e0f3225 100644 --- a/code/modules/clothing/ears/bandanna.dm +++ b/code/modules/clothing/ears/bandanna.dm @@ -11,6 +11,9 @@ w_class = ITEMSIZE_TINY slot_flags = SLOT_EARS +/obj/item/clothing/ears/bandanna/get_ear_examine_text(var/mob/user, var/ear_text = "left") + return "around [user.get_pronoun("his")] neck" + /obj/item/clothing/ears/bandanna/blue name = "blue bandanna" desc = "A plain blue bandanna." diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index e73183b97ed..757b3dd4e20 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -622,6 +622,9 @@ drop_sound = 'sound/items/drop/accessory.ogg' pickup_sound = 'sound/items/pickup/accessory.ogg' +/obj/item/clothing/accessory/dogtags/get_mask_examine_text(mob/user) + return "around [user.get_pronoun("his")] neck" + /obj/item/clothing/accessory/badge/namepin name = "pin tag" desc = "A small strip of metal to label its wearer." diff --git a/code/modules/clothing/under/accessories/badges.dm b/code/modules/clothing/under/accessories/badges.dm index 418bf610922..2f5c6484d66 100644 --- a/code/modules/clothing/under/accessories/badges.dm +++ b/code/modules/clothing/under/accessories/badges.dm @@ -121,6 +121,9 @@ drop_sound = 'sound/items/drop/ring.ogg' pickup_sound = 'sound/items/pickup/ring.ogg' +/obj/item/clothing/accessory/badge/holo/cord/get_mask_examine_text(mob/user) + return "around [user.get_pronoun("his")] neck" + /obj/item/clothing/accessory/badge/holo/attack_self(mob/user as mob) if(!stored_name) to_chat(user, "Waving around a holobadge before swiping an ID would be pretty pointless.") diff --git a/code/modules/clothing/under/accessories/lockets.dm b/code/modules/clothing/under/accessories/lockets.dm index 8a8ac8b8dec..58f489d8e39 100644 --- a/code/modules/clothing/under/accessories/lockets.dm +++ b/code/modules/clothing/under/accessories/lockets.dm @@ -13,6 +13,9 @@ drop_sound = 'sound/items/drop/ring.ogg' pickup_sound = 'sound/items/pickup/ring.ogg' +/obj/item/clothing/accessory/locket/get_mask_examine_text(mob/user) + return "around [user.get_pronoun("his")] neck" + /obj/item/clothing/accessory/locket/attack_self(mob/user as mob) if(!base_icon) base_icon = icon_state diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 134df1f27e8..aa7f6331890 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -171,9 +171,9 @@ //mask if(wear_mask && !skipmask) if(wear_mask.blood_color) - msg += "[get_pronoun("He")] [get_pronoun("has")] [icon2html(wear_mask, user)] [wear_mask.gender==PLURAL?"some":"a"] [fluid_color_type_map(wear_mask.blood_color)]-stained [wear_mask.name] on [get_pronoun("his")] face!\n" + msg += "[get_pronoun("He")] [get_pronoun("has")] [icon2html(wear_mask, user)] [wear_mask.gender==PLURAL?"some":"a"] [fluid_color_type_map(wear_mask.blood_color)]-stained [wear_mask.name] [wear_mask.get_mask_examine_text(src)]!\n" else - msg += "[get_pronoun("He")] [get_pronoun("has")] [icon2html(wear_mask, user)] \a [wear_mask] on [get_pronoun("his")] face.\n" + msg += "[get_pronoun("He")] [get_pronoun("has")] [icon2html(wear_mask, user)] \a [wear_mask] [wear_mask.get_mask_examine_text(src)].\n" //eyes if(glasses && !skipeyes) @@ -184,11 +184,11 @@ //left ear if(l_ear && !skipears) - msg += "[get_pronoun("He")] [get_pronoun("has")] [icon2html(l_ear, user)] \a [l_ear] on [get_pronoun("his")] left ear.\n" + msg += "[get_pronoun("He")] [get_pronoun("has")] [icon2html(l_ear, user)] \a [l_ear] [l_ear.get_ear_examine_text(src, "left")].\n" //right ear if(r_ear && !skipears) - msg += "[get_pronoun("He")] [get_pronoun("has")] [icon2html(r_ear, user)] \a [r_ear] on [get_pronoun("his")] right ear.\n" + msg += "[get_pronoun("He")] [get_pronoun("has")] [icon2html(r_ear, user)] \a [r_ear] [r_ear.get_ear_examine_text(src, "right")].\n" //ID if(wear_id) diff --git a/html/changelogs/geeves-show_on_neck.yml b/html/changelogs/geeves-show_on_neck.yml new file mode 100644 index 00000000000..1d131a5c2b8 --- /dev/null +++ b/html/changelogs/geeves-show_on_neck.yml @@ -0,0 +1,7 @@ +author: Geeves + +delete-after: True + +changes: + - rscadd: "Lockets, holo-badges with the string thing, dogtags, neck bandanas, and the Tajara pocketwatch now appears to hang around your neck when you get examined, instead of being on your face or ears." + - rscadd: "Tajara pocketwatche can now be worn on the mask slot."