cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-20 12:29:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Height Examine Punctuation Fix (#16865)

Browse Source 
* Height Examine Fix

* Fix

* Fix
This commit is contained in:
SleepyGemmy
2023-07-25 15:14:38 +02:00
committed by GitHub
parent f3ca37738f
commit 637bf06b52
3 changed files with 53 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/examine.dm
+30 -30
View File
@@ -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."
code/modules/mob/mob.dm
+17 -17
View File
@@ -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"