diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 962ad042902..514e4a685b4 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -223,7 +223,7 @@ msg += "[get_pronoun("He")] [get_pronoun("is")] small halfling!\n" //height if(height) - msg += "[SPAN_NOTICE("[assembleHeightString(user)]")]\n" + msg += "[SPAN_NOTICE("[assemble_height_string(user)]")]\n" //buckled_to if(buckled_to) @@ -457,60 +457,60 @@ var/output_text = color_map[supplied_color] || "fluid" return output_text -/mob/living/carbon/human/assembleHeightString(mob/examiner) - var/heightString = "" - var/descriptor +/mob/living/carbon/human/assemble_height_string(mob/examiner) + var/height_string = "" + var/height_descriptor if(height == HEIGHT_NOT_USED) - return heightString + return height_string // Compare to Species Average if(species.species_height != HEIGHT_NOT_USED) switch(height - species.species_height) if(-999 to -100) - descriptor = "miniscule" + height_descriptor = "miniscule" if(-99 to -50) - descriptor = "tiny" + height_descriptor = "tiny" if(-49 to -11) - descriptor = "small" + height_descriptor = "small" if(-10 to 10) - descriptor = "about average height" + height_descriptor = "about average height" if(11 to 50) - descriptor = "tall" + height_descriptor = "tall" if(51 to 100) - descriptor = "huge" + height_descriptor = "huge" else - descriptor = "gargantuan" - heightString += "[get_pronoun("He")] look[get_pronoun("end")] [descriptor]" + height_descriptor = "gargantuan" + height_string += "[get_pronoun("He")] look[get_pronoun("end")] [height_descriptor]" if(!species.hide_name) - heightString += " for a [species.name]" - + height_string += " for a [species.name]" + height_string += "." // Punctuation. if(examiner.height == HEIGHT_NOT_USED) - return heightString + return height_string switch(height - examiner.height) if(-999 to -100) - descriptor = "absolutely tiny compared to" + height_descriptor = "absolutely tiny compared to" if(-99 to -51) - descriptor = "much smaller than" + height_descriptor = "much smaller than" if(-50 to -21) - descriptor = "significantly shorter than" + height_descriptor = "significantly shorter than" if(-20 to -11) - descriptor = "shorter than" + height_descriptor = "shorter than" if(-10 to -6) - descriptor = "slightly shorter than" + height_descriptor = "slightly shorter than" if(-5 to 5) - descriptor = "around the same height as" + height_descriptor = "around the same height as" if(6 to 10) - descriptor = "slightly taller than" + height_descriptor = "slightly taller than" if(11 to 20) - descriptor = "taller than" + height_descriptor = "taller than" if(21 to 50) - descriptor = "significantly taller than" + height_descriptor = "significantly taller than" if(51 to 100) - descriptor = "much larger than" + height_descriptor = "much larger than" else - descriptor = "to tower over" - if(heightString) - return heightString += ", and [get_pronoun("he")] seem[get_pronoun("end")] [descriptor] you." - return "[get_pronoun("He")] seem[get_pronoun("end")] [descriptor] you." + height_descriptor = "to tower over" + if(height_string) + return height_string += "[get_pronoun("He")] seem[get_pronoun("end")] [height_descriptor] you." + return "[get_pronoun("He")] seem[get_pronoun("end")] [height_descriptor] you." diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 1ec7a39da63..5a2aa0878ba 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -1399,37 +1399,37 @@ /mob/examine(mob/user, var/distance = -1, var/infix = "", var/suffix = "") ..() - if(assembleHeightString(user)) - to_chat(user, SPAN_NOTICE(assembleHeightString(user))) + if(assemble_height_string(user)) + to_chat(user, SPAN_NOTICE(assemble_height_string(user))) //Height String for examine - Runs on the mob being examined. -/mob/proc/assembleHeightString(mob/examiner) - var/heightString = null - var/descriptor +/mob/proc/assemble_height_string(mob/examiner) + var/height_string = null + var/height_descriptor if(height == HEIGHT_NOT_USED) - return heightString + return height_string if(examiner.height == HEIGHT_NOT_USED) - return heightString + return height_string switch(height - examiner.height) if(-999 to -100) - descriptor = "absolutely tiny compared to" + height_descriptor = "absolutely tiny compared to" if(-99 to -50) - descriptor = "much smaller than" + height_descriptor = "much smaller than" if(-49 to -11) - descriptor = "shorter than" + height_descriptor = "shorter than" if(-10 to 10) - descriptor = "about the same height as" + height_descriptor = "about the same height as" if(11 to 50) - descriptor = "taller than" + height_descriptor = "taller than" if(51 to 100) - descriptor = "much larger than" + height_descriptor = "much larger than" else - descriptor = "to tower over" - if(heightString) - return heightString + ", and [get_pronoun("he")] seem[get_pronoun("end")] [descriptor] you." - return "[get_pronoun("He")] seem[get_pronoun("end")] [descriptor] you." + height_descriptor = "to tower over" + if(height_string) + return height_string + "[get_pronoun("He")] seem[get_pronoun("end")] [height_descriptor] you." + return "[get_pronoun("He")] seem[get_pronoun("end")] [height_descriptor] you." /mob/proc/get_speech_bubble_state_modifier() return "normal" diff --git a/html/changelogs/sleepygemmy-height_examine_fix.yml b/html/changelogs/sleepygemmy-height_examine_fix.yml new file mode 100644 index 00000000000..390e27a4c9e --- /dev/null +++ b/html/changelogs/sleepygemmy-height_examine_fix.yml @@ -0,0 +1,6 @@ +author: SleepyGemmy + +delete-after: True + +changes: + - bugfix: "Fixed the height examine lacking punctuation when examining as a observer."