cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-30 00:21:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Makes it so nymphs from a gestalt that splits due to damage split injured (#8946)

Browse Source
This commit is contained in:
Yonnimer
2020-05-30 09:43:05 +02:00
committed by GitHub
parent fe64acefd6
commit de8e018bb6
3 changed files with 46 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/diona_gestalt.dm
+3 -1
View File
@@ -301,7 +301,7 @@
else
nymph.key = key
/mob/living/carbon/human/proc/diona_split_into_nymphs()
/mob/living/carbon/human/proc/diona_split_into_nymphs(var/death_split = FALSE)
var/turf/T = get_turf(src)
var/mob/living/carbon/alien/diona/bestNymph = null
var/bestHealth = 0
@@ -336,6 +336,8 @@
bestNymph = D
nymphos += D
D.forceMove(T)
if(death_split && D.health != 0 && D.stat != DEAD)
D.health = D.maxHealth * 0.20
D.split_languages(src)
D.set_dir(pick(NORTH, SOUTH, EAST, WEST))
D.gestalt = null
code/modules/mob/living/carbon/human/species/station/diona/diona.dm
+2 -2
View File
@@ -160,7 +160,7 @@
/datum/species/diona/handle_death(var/mob/living/carbon/human/H, var/gibbed = 0)
if (!gibbed)
// This proc sleeps. Async it.
INVOKE_ASYNC(H, /mob/living/carbon/human/proc/diona_split_into_nymphs)
INVOKE_ASYNC(H, /mob/living/carbon/human/proc/diona_split_into_nymphs, TRUE)
/datum/species/diona/handle_speech_problems(mob/living/carbon/human/H, list/current_flags, message, message_verb, message_mode)
// Diona without head can live, but they cannot talk as loud anymore.
@@ -182,4 +182,4 @@
/datum/species/diona/handle_despawn(var/mob/living/carbon/human/H)
for(var/mob/living/carbon/alien/diona/D in H.contents)
if((!D.client && !D.mind) || D.stat == DEAD)
qdel(D)
qdel(D)