From b88684d5933fabc489bf5efd0817d0092b8cdc41 Mon Sep 17 00:00:00 2001
From: desven <45808369+desvenlafaxine@users.noreply.github.com>
Date: Sun, 7 Nov 2021 14:27:32 -0600
Subject: [PATCH] Fixes the examine text for Bulwark horns (#12733)
---
code/game/objects/items.dm | 3 +++
code/modules/clothing/ears/bulwark.dm | 5 ++++-
code/modules/mob/living/carbon/human/examine.dm | 4 ++--
html/changelogs/desven-horn_ex_fix.yml | 4 ++++
4 files changed, 13 insertions(+), 3 deletions(-)
create mode 100644 html/changelogs/desven-horn_ex_fix.yml
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 8947d248cab..463cbfbe3dd 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -951,5 +951,8 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
/obj/item/proc/get_mask_examine_text(var/mob/user)
return "on [user.get_pronoun("his")] face"
+/obj/item/proc/get_head_examine_text(var/mob/user)
+ return "on [user.get_pronoun("his")] head"
+
/obj/item/proc/should_equip() // when you press E with an empty hand, will this item be pulled from suit storage / back slot and put into your hand
return FALSE
diff --git a/code/modules/clothing/ears/bulwark.dm b/code/modules/clothing/ears/bulwark.dm
index 10cefa6ddba..f8361dde7f1 100644
--- a/code/modules/clothing/ears/bulwark.dm
+++ b/code/modules/clothing/ears/bulwark.dm
@@ -9,7 +9,10 @@
slot_flags = SLOT_HEAD | SLOT_EARS
species_restricted = list(BODYTYPE_VAURCA_BULWARK)
-/obj/item/clothing/ears/bandanna/get_ear_examine_text(var/mob/user, var/ear_text = "left")
+/obj/item/clothing/ears/bulwark/get_ear_examine_text(var/mob/user, var/ear_text = "left")
+ return "around [user.get_pronoun("his")] horns"
+
+/obj/item/clothing/ears/bulwark/get_head_examine_text(var/mob/user)
return "around [user.get_pronoun("his")] horns"
/obj/item/clothing/ears/bulwark/rings
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index 77d9a2ada57..d7675e79840 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -72,9 +72,9 @@
//head
if(head)
if(head.blood_color)
- msg += "[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(head, user)] [head.gender==PLURAL?"some":"a"] [fluid_color_type_map(head.blood_color)]-stained [head.name] on [get_pronoun("his")] head!\n"
+ msg += "[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(head, user)] [head.gender==PLURAL?"some":"a"] [fluid_color_type_map(head.blood_color)]-stained [head.name] [head.get_head_examine_text(src)]!\n"
else
- msg += "[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(head, user)] \a [head] on [get_pronoun("his")] head.\n"
+ msg += "[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(head, user)] \a [head] [head.get_head_examine_text(src)].\n"
//suit/armor
if(wear_suit)
diff --git a/html/changelogs/desven-horn_ex_fix.yml b/html/changelogs/desven-horn_ex_fix.yml
new file mode 100644
index 00000000000..29d2a2256fe
--- /dev/null
+++ b/html/changelogs/desven-horn_ex_fix.yml
@@ -0,0 +1,4 @@
+author: Desven
+delete-after: True
+changes:
+ - bugfix: "Fixed the examine text for Vaurca Bulwark horns."
\ No newline at end of file