diff --git a/code/modules/mob/living/carbon/alien/diona/diona_nymph.dm b/code/modules/mob/living/carbon/alien/diona/diona_nymph.dm index 879dd0d8ca7..8553a39d0ba 100644 --- a/code/modules/mob/living/carbon/alien/diona/diona_nymph.dm +++ b/code/modules/mob/living/carbon/alien/diona/diona_nymph.dm @@ -13,7 +13,7 @@ name = "diona nymph" voice_name = "diona nymph" accent = ACCENT_ROOTSONG - adult_form = /mob/living/carbon/human + adult_form = /mob/living/carbon/human/diona/coeus speak_emote = list("chirrups") icon = 'icons/mob/diona.dmi' icon_state = "nymph" diff --git a/code/modules/mob/living/carbon/alien/diona/progression.dm b/code/modules/mob/living/carbon/alien/diona/progression.dm index 04b95fcd13d..1af4b514483 100644 --- a/code/modules/mob/living/carbon/alien/diona/progression.dm +++ b/code/modules/mob/living/carbon/alien/diona/progression.dm @@ -8,7 +8,7 @@ src.forceMove(L.loc) qdel(L) - return SPECIES_DIONA_COEUS + return TRUE /mob/living/carbon/alien/diona/proc/grow() set name = "Exponential Growth" @@ -32,8 +32,7 @@ return // confirm_evolution() handles choices and other specific requirements. - var/new_species = confirm_evolution() - if(!new_species || !adult_form) + if(!confirm_evolution() || !adult_form) return stunned = 10 // No more moving or talking for now @@ -45,7 +44,6 @@ SPAN_WARNING("All at once, we consume our stored nutrients to surge with growth, splitting into a tangle of new gestalt. We have attained a new form.")) var/mob/living/carbon/human/adult = new adult_form(get_turf(src)) - adult.set_species(new_species) show_evolution_blurb() if(mind) diff --git a/code/modules/mob/living/carbon/human/human_species.dm b/code/modules/mob/living/carbon/human/human_species.dm index 32f4b6cfdfb..3fc068d332f 100644 --- a/code/modules/mob/living/carbon/human/human_species.dm +++ b/code/modules/mob/living/carbon/human/human_species.dm @@ -27,8 +27,12 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy/mannequin) h_style = "Unathi Horns" . = ..(mapload, SPECIES_UNATHI) -/mob/living/carbon/human/diona/Initialize(mapload) - . = ..(mapload, SPECIES_DIONA) +/mob/living/carbon/human/diona/Initialize(mapload, new_species = null) + . = ..(mapload, new_species || SPECIES_DIONA) + src.gender = NEUTER + +/mob/living/carbon/human/diona/coeus/Initialize(mapload) + . = ..(mapload, SPECIES_DIONA_COEUS) src.gender = NEUTER /mob/living/carbon/human/machine/Initialize(mapload) diff --git a/html/changelogs/diona-invisible-trunk-fix.yml b/html/changelogs/diona-invisible-trunk-fix.yml new file mode 100644 index 00000000000..ce0123b6705 --- /dev/null +++ b/html/changelogs/diona-invisible-trunk-fix.yml @@ -0,0 +1,6 @@ +author: mikomyazaki2 + +delete-after: True + +changes: + - bugfix: "Nymphs that grow into full gestalts should now always have a visible chest icon."