Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dionae changes #11905

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+14 −6
Open

Dionae changes #11905

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b013810
Update nymph.dm
XeonMations Nov 19, 2024
7c02d0c
Update nymph.dm
XeonMations Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions code/modules/mob/living/simple_animal/hostile/retaliate/nymph.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,21 +172,29 @@
grown_message_sent = TRUE

/mob/living/simple_animal/hostile/retaliate/nymph/proc/on_entered(datum/source, atom/movable/arrived, atom/old_loc, list/atom/old_locs)
SIGNAL_HANDLER
INVOKE_ASYNC(src, PROC_REF(nymph_assimilation), source, arrived)

/mob/living/simple_animal/hostile/retaliate/nymph/proc/nymph_assimilation(datum/source, atom/movable/arrived)
if(isdiona(arrived))
if(mind != null || stat == DEAD || is_drone) //Does the nymph on the ground have a mind, dead or a drone?
return // If so, ignore the diona
var/mob/living/carbon/human/H = arrived
var/list/limbs_to_heal = H.get_missing_limbs()
var/mob/living/carbon/human/arrived_diona = arrived
var/list/limbs_to_heal = arrived_diona.get_missing_limbs()
if(!LAZYLEN(limbs_to_heal))
return
playsound(H, 'sound/creatures/venus_trap_hit.ogg', 25, 1)
toggle_ai(AI_OFF)
if(!do_after(arrived_diona, 5 SECONDS, source, progress = TRUE))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This proc doesn't have the SIGNAL_HANDLER define in error. If you add it you will find that this line fails because signal handlers shouldn't be sleeping as they cause unpredictable behaviour. You will need to mark this proc as a signal handler and either call this behaviour asynchronously or set the proc to waitfor false.

toggle_ai(AI_IDLE)
return
playsound(arrived_diona, 'sound/creatures/venus_trap_hit.ogg', 25, 1)
var/obj/item/bodypart/healed_limb = pick(limbs_to_heal)
H.regenerate_limb(healed_limb)
for(var/obj/item/bodypart/body_part in H.bodyparts)
arrived_diona.regenerate_limb(healed_limb)
for(var/obj/item/bodypart/body_part in arrived_diona.bodyparts)
if(body_part.body_zone == healed_limb)
body_part.brute_dam = brute_damage
body_part.burn_dam = fire_damage
balloon_alert(H, "[H] assimilates [src]")
balloon_alert(arrived_diona, "[arrived_diona] assimilates [src]")
QDEL_NULL(src)

/mob/living/simple_animal/hostile/retaliate/nymph/handle_mutations_and_radiation()
Expand Down
Loading