From ecb31f35fdb4fcad03232931397e2cfd1659dadd Mon Sep 17 00:00:00 2001
From: Sniblet <36427443+Sniblet@users.noreply.github.com>
Date: Thu, 18 May 2023 11:01:43 -0400
Subject: [PATCH] Flavour-only height system no longer gives shells away, also
 grammar tweaks (#16309)

* the pr

* found more problems

* test fix

* returns

* Update examine.dm

* just about

as opposed to around about

* Update sniblet-sameheightyou.yml

* around instead

just obsessing over wording

* Update code/modules/mob/living/carbon/human/examine.dm

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

* like this?

---------

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>
---
 code/modules/mob/living/carbon/human/examine.dm | 11 ++++++-----
 code/modules/mob/mob.dm                         |  2 +-
 html/changelogs/sniblet-sameheightyou.yml       | 14 ++++++++++++++
 3 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 html/changelogs/sniblet-sameheightyou.yml

diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index 65c698a5510..2644b279d1d 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -461,7 +461,7 @@
 	return output_text
 
 /mob/living/carbon/human/assembleHeightString(mob/examiner)
-	var/heightString = null
+	var/list/heightString = list()
 	var/descriptor
 	if(height == HEIGHT_NOT_USED)
 		return heightString
@@ -483,7 +483,9 @@
 				descriptor = "huge"
 			else
 				descriptor = "gargantuan"
-		heightString = "[get_pronoun("He")] look[get_pronoun("end")] [descriptor] for \a [species.name]"
+		heightString += "[get_pronoun("He")] look[get_pronoun("end")] [descriptor]"
+		if(!species.hide_name)
+			heightString += " for a [species.name]"
 
 
 	if(examiner.height == HEIGHT_NOT_USED)
@@ -501,7 +503,7 @@
 		if(-10 to -6)
 			descriptor = "slightly shorter than"
 		if(-5 to 5)
-			descriptor = "around about the same height"
+			descriptor = "around the same height as"
 		if(6 to 10)
 			descriptor = "slightly taller than"
 		if(11 to 20)
@@ -513,6 +515,5 @@
 		else
 			descriptor = "to tower over"
 	if(heightString)
-		return heightString + ", and [get_pronoun("he")] seem[get_pronoun("end")] [descriptor] you."
+		return heightString += ", and [get_pronoun("he")] seem[get_pronoun("end")] [descriptor] you."
 	return "[get_pronoun("He")] seem[get_pronoun("end")] [descriptor] you."
-
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 60f9565639b..888d6b35afe 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -1542,7 +1542,7 @@
 		if(-49 to -11)
 			descriptor = "shorter than"
 		if(-10 to 10)
-			descriptor = "around about the same height"
+			descriptor = "about the same height as"
 		if(11 to 50)
 			descriptor = "taller than"
 		if(51 to 100)
diff --git a/html/changelogs/sniblet-sameheightyou.yml b/html/changelogs/sniblet-sameheightyou.yml
new file mode 100644
index 00000000000..9828aeee64f
--- /dev/null
+++ b/html/changelogs/sniblet-sameheightyou.yml
@@ -0,0 +1,14 @@
+# Your name.
+author: Sniblet
+
+# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - spellcheck: "Fixed a missing 'as' and redundant 'about' in the same-height flavor string."
+  - tweak: "Height strings no longer display the race of races that are not supposed to show race on examine (humans, shells, zombies)."