More Descriptors + Two More Prominents + One Bug Fix that annoyed me

code/datums/mob_descriptors/descriptors/body.dm

@@ -103,3 +103,27 @@
 
 /datum/mob_descriptor/body/absurd
 	name = "Absurd"
+
+/datum/mob_descriptor/body/concave
+	name = "Concave"
+
+/datum/mob_descriptor/body/dumpy
+	name = "Dumpy"
+
+/datum/mob_descriptor/body/meaty
+	name = "Meaty"
+
+/datum/mob_descriptor/body/widerthantall
+	name = "Wider-Than-Tall"
+
+/datum/mob_descriptor/body/brickhouse
+	name = "Brick House"
+
+/datum/mob_descriptor/body/brickshithouse
+	name = "Brick Shithouse"
+
+/datum/mob_descriptor/body/moatflooding
+	name = "Moat-Flooding"
+
+/datum/mob_descriptor/body/wellclogging
+	name = "Well-Clogging"

code/datums/mob_descriptors/descriptors/face.dm

@@ -59,6 +59,15 @@
 /datum/mob_descriptor/face/full
 	name = "Full"
 
+/datum/mob_descriptor/face/flat
+	name = "Flat"
+
+/datum/mob_descriptor/face/symmetrical
+	name = "Symmetrical"
+
+/datum/mob_descriptor/face/shiny
+	name = "Shiny"
+
 /datum/mob_descriptor/face_exp
 	abstract_type = /datum/mob_descriptor/face_exp
 	suffix = "face"
@@ -198,3 +207,21 @@
 
 /datum/mob_descriptor/face_exp/bored
 	name = "Bored"
+
+/datum/mob_descriptor/face_exp/feral
+	name = "Feral"
+
+/datum/mob_descriptor/face_exp/frothing
+	name = "Frothing"
+
+/datum/mob_descriptor/face_exp/grimacing
+	name = "Grimacing"
+
+/datum/mob_descriptor/face_exp/weepy
+	name = "Weepy"
+
+/datum/mob_descriptor/face_exp/dusky
+	name = "Dusky"
+
+/datum/mob_descriptor/face_exp/pained
+	name = "Pained"

code/datums/mob_descriptors/descriptors/height.dm

@@ -45,3 +45,7 @@
 /datum/mob_descriptor/height/skyscraping
 	name = "Sky-Scraping"
 	prefix = "a"
+
+/datum/mob_descriptor/height/miniscule
+	name = "Miniscule"
+	prefix = "a"

code/datums/mob_descriptors/descriptors/prominent.dm

@@ -435,3 +435,33 @@
 /datum/mob_descriptor/prominent/noisy_balls
 	name = "Noisy Balls"
 	verbage = "%HAVE%"
+
+/datum/mob_descriptor/prominent/prominent_penis
+	name = "Prominent Penis"
+	verbage = "%HAVE%"
+
+/datum/mob_descriptor/prominent/lamptern_sized_knot
+	name = "Lamptern Size Knot"
+	verbage = "%HAVE%"
+	prefix = "a"
+
+/datum/mob_descriptor/prominent/prominent_paws
+	name = "Prominent Paws"
+	verbage = "%HAVE%"
+
+/datum/mob_descriptor/prominent/prominent_feet
+	name = "Prominent Feet"
+	verbage = "%HAVE%"
+
+/datum/mob_descriptor/prominent/sumacly
+	name = "Sumac-ly"
+	verbage = "%ARE%"
+
+/datum/mob_descriptor/prominent/lovehandles
+	name = "Lovehandles"
+	verbage = "%HAVE%"
+
+/datum/mob_descriptor/prominent/cellulite_riddled_ass
+	name = "Cellulite Riddled Ass"
+	verbage = "%HAVE%"
+	prefix = "a"

code/datums/mob_descriptors/descriptors/stature.dm

@@ -308,3 +308,48 @@
 
 /datum/mob_descriptor/stature/chud
 	name = "Chud"
+
+/datum/mob_descriptor/stature/subject
+	name = "Subject"
+
+/datum/mob_descriptor/stature/oni
+	name = "Oni"
+
+/datum/mob_descriptor/stature/snack
+	name = "Snack"
+
+/datum/mob_descriptor/stature/ambrose
+	name = "Ambrose"
+
+/datum/mob_descriptor/stature/dweller
+	name = "Dweller"
+
+/datum/mob_descriptor/stature/outlaw
+	name = "Outlaw"
+
+/datum/mob_descriptor/stature/fleshlight //might be pushing it
+	name = "Fleshlight"
+
+/datum/mob_descriptor/stature/mess
+	name = "Mess"
+
+/datum/mob_descriptor/stature/yowler
+	name = "Yowler"
+
+/datum/mob_descriptor/stature/whiner
+	name = "Whiner"
+
+/datum/mob_descriptor/stature/rag
+	name = "Rag"
+
+/datum/mob_descriptor/stature/mop
+	name = "Mop"
+
+/datum/mob_descriptor/stature/cuddlebug
+	name = "Cuddlebug"
+
+/datum/mob_descriptor/stature/victim
+	name = "Victim"
+
+/datum/mob_descriptor/stature/jackal
+	name = "Jackal"

code/datums/mob_descriptors/descriptors/trait.dm

@@ -310,3 +310,71 @@
 /datum/mob_descriptor/trait/twozennies
 	name = "Two Zennies Short"
 	prefix = "%ARE% very"
+
+/datum/mob_descriptor/trait/feral
+	name = "Feral"
+	prefix = "%ARE% very"
+
+/datum/mob_descriptor/trait/hungry
+	name = "Hungry"
+	prefix = "%ARE% very"
+
+/datum/mob_descriptor/trait/breasted
+	name = "Breasted"
+	prefix = "%ARE% boobily"
+
+/datum/mob_descriptor/trait/silly
+	name = "Silly"
+	prefix = "%ARE% very"
+
+/datum/mob_descriptor/trait/squishy
+	name = "Squishy"
+	prefix = "%ARE% very"
+
+/datum/mob_descriptor/trait/lumpy
+	name = "Lumpy"
+	prefix = "%ARE% very"
+
+/datum/mob_descriptor/trait/concave
+	name = "Concave"
+	prefix = "%ARE% very"
+
+/datum/mob_descriptor/trait/obsidian
+	name = "Obsidian"
+	prefix = "%ARE% very"
+
+/datum/mob_descriptor/trait/alabaster
+	name = "Alabaster"
+	prefix = "%ARE% very"
+
+/datum/mob_descriptor/trait/amaranth
+	name = "Amaranth"
+	prefix = "%ARE% very"
+
+/datum/mob_descriptor/trait/annoying
+	name = "Annoying"
+	prefix = "%ARE% very"
+
+/datum/mob_descriptor/trait/tasty
+	name = "Tasty"
+	prefix = "%ARE% very"
+
+/datum/mob_descriptor/trait/pompous
+	name = "Pompous"
+	prefix = "%ARE% very"
+
+/datum/mob_descriptor/trait/bugeyed
+	name = "Bug-Eyed"
+	prefix = "%ARE% very"
+
+/datum/mob_descriptor/trait/scarlet
+	name = "Scarlet"
+	prefix = "%ARE% very"
+
+/datum/mob_descriptor/trait/sweatsoaked
+	name = "Sweat-Soaked"
+	prefix = "%ARE% very"
+
+/datum/mob_descriptor/trait/sweaty
+	name = "Sweaty"
+	prefix = "%ARE% very"

code/datums/mob_descriptors/descriptors/voice.dm

@@ -129,3 +129,15 @@
 
 /datum/mob_descriptor/voice/accented
 	name = "Accented"
+
+/datum/mob_descriptor/voice/feral
+	name = "Feral"
+
+/datum/mob_descriptor/voice/weepy
+	name = "Weepy"
+
+/datum/mob_descriptor/voice/pained
+	name = "Pained"
+
+/datum/mob_descriptor/voice/annoyed
+	name = "Annoyed"

code/modules/client/descriptors/descriptor_choice.dm

@@ -26,6 +26,9 @@
 		/datum/mob_descriptor/face/chubby,
 		/datum/mob_descriptor/face/mousy,
 		/datum/mob_descriptor/face/full,
+		/datum/mob_descriptor/face/flat,
+		/datum/mob_descriptor/face/symmetrical,
+		/datum/mob_descriptor/face/shiny,
 	)
 
 /datum/descriptor_choice/face_exp
@@ -76,6 +79,12 @@
 		/datum/mob_descriptor/face_exp/tired,
 		/datum/mob_descriptor/face_exp/exhausted,
 		/datum/mob_descriptor/face_exp/bored,
+		/datum/mob_descriptor/face_exp/feral,
+		/datum/mob_descriptor/face_exp/frothing,
+		/datum/mob_descriptor/face_exp/grimacing,
+		/datum/mob_descriptor/face_exp/weepy,
+		/datum/mob_descriptor/face_exp/dusky,
+		/datum/mob_descriptor/face_exp/pained,
 	)
 
 /datum/descriptor_choice/body
@@ -116,6 +125,14 @@
 		/datum/mob_descriptor/body/barrelchested,
 		/datum/mob_descriptor/body/brutish,
 		/datum/mob_descriptor/body/absurd,
+		/datum/mob_descriptor/body/concave,
+		/datum/mob_descriptor/body/dumpy,
+		/datum/mob_descriptor/body/meaty,
+		/datum/mob_descriptor/body/widerthantall,
+		/datum/mob_descriptor/body/brickhouse,
+		/datum/mob_descriptor/body/brickshithouse,
+		/datum/mob_descriptor/body/moatflooding,
+		/datum/mob_descriptor/body/wellclogging,
 	)
 
 /datum/descriptor_choice/stature
@@ -211,6 +228,21 @@
 		/datum/mob_descriptor/stature/sumac,
 		/datum/mob_descriptor/stature/himbo,
 		/datum/mob_descriptor/stature/chud,
+		/datum/mob_descriptor/stature/subject,
+		/datum/mob_descriptor/stature/oni,
+		/datum/mob_descriptor/stature/snack,
+		/datum/mob_descriptor/stature/ambrose,
+		/datum/mob_descriptor/stature/dweller,
+		/datum/mob_descriptor/stature/outlaw,
+		/datum/mob_descriptor/stature/fleshlight,
+		/datum/mob_descriptor/stature/mess,
+		/datum/mob_descriptor/stature/yowler,
+		/datum/mob_descriptor/stature/whiner,
+		/datum/mob_descriptor/stature/rag,
+		/datum/mob_descriptor/stature/mop,
+		/datum/mob_descriptor/stature/cuddlebug,
+		/datum/mob_descriptor/stature/victim,
+		/datum/mob_descriptor/stature/jackal,
 	)
 
 /datum/descriptor_choice/voice
@@ -255,6 +287,10 @@
 		/datum/mob_descriptor/voice/brassy,
 		/datum/mob_descriptor/voice/ghostly,
 		/datum/mob_descriptor/voice/accented,
+		/datum/mob_descriptor/voice/feral,
+		/datum/mob_descriptor/voice/weepy,
+		/datum/mob_descriptor/voice/pained,
+		/datum/mob_descriptor/voice/annoyed,
 	)
 
 /datum/descriptor_choice/skin
@@ -338,6 +374,7 @@
 		/datum/mob_descriptor/height/enormous,
 		/datum/mob_descriptor/height/baothan,
 		/datum/mob_descriptor/height/skyscraping,
+		/datum/mob_descriptor/height/miniscule,
 	)
 /datum/descriptor_choice/trait
 	name = "Physical Descriptor"
@@ -420,6 +457,20 @@
 		/datum/mob_descriptor/trait/ravenous,
 		/datum/mob_descriptor/trait/rotund,
 		/datum/mob_descriptor/trait/twozennies,
+		/datum/mob_descriptor/trait/feral,
+		/datum/mob_descriptor/trait/hungry,
+		/datum/mob_descriptor/trait/breasted,
+		/datum/mob_descriptor/trait/silly,
+		/datum/mob_descriptor/trait/squishy,
+		/datum/mob_descriptor/trait/lumpy,
+		/datum/mob_descriptor/trait/concave,
+		/datum/mob_descriptor/trait/obsidian,
+		/datum/mob_descriptor/trait/alabaster,
+		/datum/mob_descriptor/trait/amaranth,
+		/datum/mob_descriptor/trait/annoying,
+		/datum/mob_descriptor/trait/tasty,
+		/datum/mob_descriptor/trait/pompous,
+		/datum/mob_descriptor/trait/bugeyed,
 	)
 
 /datum/descriptor_choice/skin_all
@@ -532,6 +583,13 @@
 	/datum/mob_descriptor/prominent/loud_genitals,\
 	/datum/mob_descriptor/prominent/overly_productive_genitals,\
 	/datum/mob_descriptor/prominent/noisy_balls,\
+	/datum/mob_descriptor/prominent/prominent_penis,\
+	/datum/mob_descriptor/prominent/lamptern_sized_knot,\
+	/datum/mob_descriptor/prominent/prominent_paws,\
+	/datum/mob_descriptor/prominent/prominent_feet,\
+	/datum/mob_descriptor/prominent/sumacly,\
+	/datum/mob_descriptor/prominent/lovehandles,\
+	/datum/mob_descriptor/prominent/cellulite_riddled_ass,\
 	/datum/mob_descriptor/prominent/custom/one,\
 	/datum/mob_descriptor/prominent/custom/two
 
@@ -573,6 +631,16 @@
 	default_descriptor = /datum/mob_descriptor/prominent/none
 	descriptors = list(/datum/mob_descriptor/prominent/none, PROMINENT_DESCRIPTORS)
 
+/datum/descriptor_choice/prominent_five
+	name = "Prominent #5"
+	default_descriptor = /datum/mob_descriptor/prominent/none
+	descriptors = list(/datum/mob_descriptor/prominent/none, PROMINENT_DESCRIPTORS)
+
+/datum/descriptor_choice/prominent_six
+	name = "Prominent #6"
+	default_descriptor = /datum/mob_descriptor/prominent/none
+	descriptors = list(/datum/mob_descriptor/prominent/none, PROMINENT_DESCRIPTORS)
+
 /datum/descriptor_choice/prominent_one_wild
 	name = "Prominent #1"
 	default_descriptor = /datum/mob_descriptor/prominent/unkempt
@@ -593,5 +661,15 @@
 	default_descriptor = /datum/mob_descriptor/prominent/none
 	descriptors = list(/datum/mob_descriptor/prominent/none, PROMINENT_WILDKIN, PROMINENT_DESCRIPTORS)
 
+/datum/descriptor_choice/prominent_five_wild
+	name = "Prominent #5"
+	default_descriptor = /datum/mob_descriptor/prominent/none
+	descriptors = list(/datum/mob_descriptor/prominent/none, PROMINENT_WILDKIN, PROMINENT_DESCRIPTORS)
+
+/datum/descriptor_choice/prominent_six_wild
+	name = "Prominent #6"
+	default_descriptor = /datum/mob_descriptor/prominent/none
+	descriptors = list(/datum/mob_descriptor/prominent/none, PROMINENT_WILDKIN, PROMINENT_DESCRIPTORS)
+
 #undef PROMINENT_DESCRIPTORS
 #undef PROMINENT_WILDKIN