diff --git a/code/datums/mob_descriptors/descriptors/body.dm b/code/datums/mob_descriptors/descriptors/body.dm index 29ad3a2db1f..53b0eca4561 100644 --- a/code/datums/mob_descriptors/descriptors/body.dm +++ b/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" diff --git a/code/datums/mob_descriptors/descriptors/face.dm b/code/datums/mob_descriptors/descriptors/face.dm index 080eb086a4f..4669a9365d5 100644 --- a/code/datums/mob_descriptors/descriptors/face.dm +++ b/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" diff --git a/code/datums/mob_descriptors/descriptors/height.dm b/code/datums/mob_descriptors/descriptors/height.dm index 9eba59104c1..19a01517bb7 100644 --- a/code/datums/mob_descriptors/descriptors/height.dm +++ b/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" diff --git a/code/datums/mob_descriptors/descriptors/prominent.dm b/code/datums/mob_descriptors/descriptors/prominent.dm index aff5ee46da8..681c0c5aa41 100644 --- a/code/datums/mob_descriptors/descriptors/prominent.dm +++ b/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" diff --git a/code/datums/mob_descriptors/descriptors/stature.dm b/code/datums/mob_descriptors/descriptors/stature.dm index ddfe2165a7a..09fea8cbc96 100644 --- a/code/datums/mob_descriptors/descriptors/stature.dm +++ b/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" diff --git a/code/datums/mob_descriptors/descriptors/trait.dm b/code/datums/mob_descriptors/descriptors/trait.dm index 830191ea769..50a955c8431 100644 --- a/code/datums/mob_descriptors/descriptors/trait.dm +++ b/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" diff --git a/code/datums/mob_descriptors/descriptors/voice.dm b/code/datums/mob_descriptors/descriptors/voice.dm index 5f4852d68d9..f194cd1a6ce 100644 --- a/code/datums/mob_descriptors/descriptors/voice.dm +++ b/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" diff --git a/code/modules/client/descriptors/descriptor_choice.dm b/code/modules/client/descriptors/descriptor_choice.dm index 284b4d65fb5..3739f1ac2e3 100644 --- a/code/modules/client/descriptors/descriptor_choice.dm +++ b/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 diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index c59410a1c9b..cb7127b7152 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -150,6 +150,8 @@ GLOBAL_LIST_EMPTY(roundstart_races) /datum/descriptor_choice/prominent_two, /datum/descriptor_choice/prominent_three, /datum/descriptor_choice/prominent_four, + /datum/descriptor_choice/prominent_five, + /datum/descriptor_choice/prominent_six ) // Associative list of stat (STAT_STRENGTH, etc) bonuses used to differentiate each race. They should ALWAYS be positive. diff --git a/code/modules/mob/living/carbon/human/species_types/furry/akula.dm b/code/modules/mob/living/carbon/human/species_types/furry/akula.dm index 983f39c0e4a..c293dd6555f 100644 --- a/code/modules/mob/living/carbon/human/species_types/furry/akula.dm +++ b/code/modules/mob/living/carbon/human/species_types/furry/akula.dm @@ -98,11 +98,11 @@ /datum/customizer/organ/ears/axian, /datum/customizer/organ/testicles/anthro, /datum/customizer/organ/penis/anthro, - /datum/customizer/organ/breasts/human, + /datum/customizer/organ/breasts/animal, /datum/customizer/organ/vagina/human_anthro, //Caustic edit - If the chest is human, so is the butt? /datum/customizer/organ/belly/animal, - /datum/customizer/organ/butt/human, + /datum/customizer/organ/butt/animal, //Caustic edit end ) body_marking_sets = list( @@ -139,6 +139,8 @@ /datum/descriptor_choice/prominent_two, /datum/descriptor_choice/prominent_three, /datum/descriptor_choice/prominent_four, + /datum/descriptor_choice/prominent_five, + /datum/descriptor_choice/prominent_six ) /datum/species/akula/check_roundstart_eligible() diff --git a/code/modules/mob/living/carbon/human/species_types/furry/anthromorph.dm b/code/modules/mob/living/carbon/human/species_types/furry/anthromorph.dm index f1762a3dcab..e45aadb55b8 100644 --- a/code/modules/mob/living/carbon/human/species_types/furry/anthromorph.dm +++ b/code/modules/mob/living/carbon/human/species_types/furry/anthromorph.dm @@ -174,6 +174,8 @@ /datum/descriptor_choice/prominent_two_wild, /datum/descriptor_choice/prominent_three_wild, /datum/descriptor_choice/prominent_four_wild, + /datum/descriptor_choice/prominent_five_wild, + /datum/descriptor_choice/prominent_six_wild ) /datum/species/anthromorph/on_species_gain(mob/living/carbon/C, datum/species/old_species) diff --git a/code/modules/mob/living/carbon/human/species_types/furry/anthromorphsmall.dm b/code/modules/mob/living/carbon/human/species_types/furry/anthromorphsmall.dm index 364b1a53b7b..ac0fb036c0d 100644 --- a/code/modules/mob/living/carbon/human/species_types/furry/anthromorphsmall.dm +++ b/code/modules/mob/living/carbon/human/species_types/furry/anthromorphsmall.dm @@ -127,6 +127,8 @@ /datum/descriptor_choice/prominent_two_wild, /datum/descriptor_choice/prominent_three_wild, /datum/descriptor_choice/prominent_four_wild, + /datum/descriptor_choice/prominent_five_wild, + /datum/descriptor_choice/prominent_six_wild ) /datum/species/anthromorphsmall/on_species_gain(mob/living/carbon/C, datum/species/old_species) diff --git a/code/modules/mob/living/carbon/human/species_types/furry/demihuman.dm b/code/modules/mob/living/carbon/human/species_types/furry/demihuman.dm index 770ab56e40e..cdb9e775d61 100644 --- a/code/modules/mob/living/carbon/human/species_types/furry/demihuman.dm +++ b/code/modules/mob/living/carbon/human/species_types/furry/demihuman.dm @@ -142,6 +142,8 @@ /datum/descriptor_choice/prominent_two_wild, /datum/descriptor_choice/prominent_three_wild, /datum/descriptor_choice/prominent_four_wild, + /datum/descriptor_choice/prominent_five_wild, + /datum/descriptor_choice/prominent_six_wild ) /datum/species/demihuman/check_roundstart_eligible() diff --git a/code/modules/mob/living/carbon/human/species_types/furry/dracon.dm b/code/modules/mob/living/carbon/human/species_types/furry/dracon.dm index a0251fa57cb..6182ac90a6b 100644 --- a/code/modules/mob/living/carbon/human/species_types/furry/dracon.dm +++ b/code/modules/mob/living/carbon/human/species_types/furry/dracon.dm @@ -154,6 +154,8 @@ /datum/descriptor_choice/prominent_two, /datum/descriptor_choice/prominent_three, /datum/descriptor_choice/prominent_four, + /datum/descriptor_choice/prominent_five, + /datum/descriptor_choice/prominent_six ) /datum/species/dracon/check_roundstart_eligible() diff --git a/code/modules/mob/living/carbon/human/species_types/furry/kobold.dm b/code/modules/mob/living/carbon/human/species_types/furry/kobold.dm index f71b28fe5b6..99d1235f4ab 100644 --- a/code/modules/mob/living/carbon/human/species_types/furry/kobold.dm +++ b/code/modules/mob/living/carbon/human/species_types/furry/kobold.dm @@ -146,6 +146,8 @@ /datum/descriptor_choice/prominent_two, /datum/descriptor_choice/prominent_three, /datum/descriptor_choice/prominent_four, + /datum/descriptor_choice/prominent_five, + /datum/descriptor_choice/prominent_six ) /datum/species/kobold/check_roundstart_eligible() diff --git a/code/modules/mob/living/carbon/human/species_types/furry/lizardfolk.dm b/code/modules/mob/living/carbon/human/species_types/furry/lizardfolk.dm index 29355944129..2844dda9c6b 100644 --- a/code/modules/mob/living/carbon/human/species_types/furry/lizardfolk.dm +++ b/code/modules/mob/living/carbon/human/species_types/furry/lizardfolk.dm @@ -148,6 +148,8 @@ /datum/descriptor_choice/prominent_two, /datum/descriptor_choice/prominent_three, /datum/descriptor_choice/prominent_four, + /datum/descriptor_choice/prominent_five, + /datum/descriptor_choice/prominent_six ) /datum/species/lizardfolk/check_roundstart_eligible() diff --git a/code/modules/mob/living/carbon/human/species_types/furry/lupian.dm b/code/modules/mob/living/carbon/human/species_types/furry/lupian.dm index 469f7dbb0b9..4c7bdeb4e92 100644 --- a/code/modules/mob/living/carbon/human/species_types/furry/lupian.dm +++ b/code/modules/mob/living/carbon/human/species_types/furry/lupian.dm @@ -144,6 +144,8 @@ /datum/descriptor_choice/prominent_two, /datum/descriptor_choice/prominent_three, /datum/descriptor_choice/prominent_four, + /datum/descriptor_choice/prominent_five, + /datum/descriptor_choice/prominent_six ) languages = list( /datum/language/common, diff --git a/code/modules/mob/living/carbon/human/species_types/furry/moth.dm b/code/modules/mob/living/carbon/human/species_types/furry/moth.dm index 24389c828a6..b954a89bb43 100644 --- a/code/modules/mob/living/carbon/human/species_types/furry/moth.dm +++ b/code/modules/mob/living/carbon/human/species_types/furry/moth.dm @@ -140,6 +140,8 @@ /datum/descriptor_choice/prominent_two, /datum/descriptor_choice/prominent_three, /datum/descriptor_choice/prominent_four, + /datum/descriptor_choice/prominent_five, + /datum/descriptor_choice/prominent_six ) /datum/species/moth/check_roundstart_eligible() diff --git a/code/modules/mob/living/carbon/human/species_types/furry/tabaxi.dm b/code/modules/mob/living/carbon/human/species_types/furry/tabaxi.dm index 4d34278003d..485c95ef325 100644 --- a/code/modules/mob/living/carbon/human/species_types/furry/tabaxi.dm +++ b/code/modules/mob/living/carbon/human/species_types/furry/tabaxi.dm @@ -146,6 +146,8 @@ /datum/descriptor_choice/prominent_two, /datum/descriptor_choice/prominent_three, /datum/descriptor_choice/prominent_four, + /datum/descriptor_choice/prominent_five, + /datum/descriptor_choice/prominent_six ) /datum/species/tabaxi/check_roundstart_eligible() diff --git a/code/modules/mob/living/carbon/human/species_types/furry/vulpkanin.dm b/code/modules/mob/living/carbon/human/species_types/furry/vulpkanin.dm index c023f869898..c3fe3a92c24 100644 --- a/code/modules/mob/living/carbon/human/species_types/furry/vulpkanin.dm +++ b/code/modules/mob/living/carbon/human/species_types/furry/vulpkanin.dm @@ -133,6 +133,8 @@ /datum/descriptor_choice/prominent_two, /datum/descriptor_choice/prominent_three, /datum/descriptor_choice/prominent_four, + /datum/descriptor_choice/prominent_five, + /datum/descriptor_choice/prominent_six ) languages = list( /datum/language/common, diff --git a/code/modules/mob/living/carbon/human/species_types/roguetown/dullahan/dullahan.dm b/code/modules/mob/living/carbon/human/species_types/roguetown/dullahan/dullahan.dm index f5b867b4a91..27a4ae28b2e 100644 --- a/code/modules/mob/living/carbon/human/species_types/roguetown/dullahan/dullahan.dm +++ b/code/modules/mob/living/carbon/human/species_types/roguetown/dullahan/dullahan.dm @@ -171,6 +171,8 @@ /datum/descriptor_choice/prominent_two_wild, /datum/descriptor_choice/prominent_three_wild, /datum/descriptor_choice/prominent_four_wild, + /datum/descriptor_choice/prominent_five_wild, + /datum/descriptor_choice/prominent_six_wild ) languages = list( /datum/language/common, diff --git a/code/modules/mob/living/carbon/human/species_types/roguetown/goblin/goblinp.dm b/code/modules/mob/living/carbon/human/species_types/roguetown/goblin/goblinp.dm index 8f008ab129b..77261f6dbdb 100644 --- a/code/modules/mob/living/carbon/human/species_types/roguetown/goblin/goblinp.dm +++ b/code/modules/mob/living/carbon/human/species_types/roguetown/goblin/goblinp.dm @@ -116,6 +116,8 @@ /datum/descriptor_choice/prominent_two_wild, /datum/descriptor_choice/prominent_three_wild, /datum/descriptor_choice/prominent_four_wild, + /datum/descriptor_choice/prominent_five_wild, + /datum/descriptor_choice/prominent_six_wild ) /datum/species/goblinp/check_roundstart_eligible() diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index f39290b2785..5796b9c7767 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -703,7 +703,7 @@ m_intent = MOVE_INTENT_SNEAK if(isliving(src)) var/mob/living/L = src - if((/datum/mob_descriptor/prominent/prominent_bottom in L.mob_descriptors) || (/datum/mob_descriptor/prominent/prominent_thighs in L.mob_descriptors)) + if((/datum/mob_descriptor/prominent/prominent_bottom in L.mob_descriptors) || (/datum/mob_descriptor/prominent/prominent_thighs in L.mob_descriptors) || (/datum/mob_descriptor/prominent/cellulite_riddled_ass in L.mob_descriptors) || (/datum/mob_descriptor/prominent/thicker_than_hardtack in L.mob_descriptors) || (/datum/mob_descriptor/prominent/prominent_paws in L.mob_descriptors)) L.loud_sneaking = TRUE else L.loud_sneaking = FALSE diff --git a/modular_causticcove/code/modules/harpies/harpy_species.dm b/modular_causticcove/code/modules/harpies/harpy_species.dm index 6794332a7e5..baa1433c76f 100644 --- a/modular_causticcove/code/modules/harpies/harpy_species.dm +++ b/modular_causticcove/code/modules/harpies/harpy_species.dm @@ -144,6 +144,8 @@ /datum/descriptor_choice/prominent_two_wild, /datum/descriptor_choice/prominent_three_wild, /datum/descriptor_choice/prominent_four_wild, + /datum/descriptor_choice/prominent_five_wild, + /datum/descriptor_choice/prominent_six ) /datum/species/harpy/get_hairc_list()