diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index 620633d6dc..9679631169 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -67,7 +67,6 @@ M.adjustOxyLoss(oxy_damage) M.adjustBruteLoss(brute_damage) - equip(M) if(ckey) M.ckey = ckey @@ -78,6 +77,7 @@ MM.objectives += new/datum/objective(objective) special(M) MM.name = M.real_name + equip(M) if(uses > 0) uses-- if(!permanent && !uses) @@ -115,6 +115,12 @@ /obj/effect/mob_spawn/human/equip(mob/living/carbon/human/H) if(mob_species) H.set_species(mob_species) + else + //If we're a human, we still need to handle our snowflake code anyway I guess. + if (NOAROUSAL in H.dna.species.species_traits) + H.canbearoused = FALSE + else + H.canbearoused = H.client.prefs.arousable if(husk) H.Drain() diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 0127debeeb..f46364ae46 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -159,6 +159,10 @@ species_traits += DIGITIGRADE if(DIGITIGRADE in species_traits) C.Digitigrade_Leg_Swap(FALSE) + if(NOAROUSAL in species_traits) + C.canbearoused = FALSE + else + C.canbearoused = C.client.prefs.arousable /datum/species/proc/on_species_loss(mob/living/carbon/C) if(C.dna.species.exotic_bloodtype)