From 7d139fca31d8bab8ea82587358c8fdfb213a2115 Mon Sep 17 00:00:00 2001 From: Time-Green <7501474+Time-Green@users.noreply.github.com> Date: Sun, 3 Nov 2024 17:59:21 +0100 Subject: [PATCH] Fixes space kidnap being instant (#87654) Yeah apparently the voidwalker kidnap was completely instant https://github.com/tgstation/tgstation/pull/86031 replaced the callback that checked for being incapacitated with the number 1 :cl: fix: Fixes voidwalker having an instant kidnap /:cl: --------- Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> --- code/datums/components/space_kidnap.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/datums/components/space_kidnap.dm b/code/datums/components/space_kidnap.dm index 7d59a6d7f9f..a95d66c3a72 100644 --- a/code/datums/components/space_kidnap.dm +++ b/code/datums/components/space_kidnap.dm @@ -39,7 +39,7 @@ var/obj/particles = new /obj/effect/abstract/particle_holder (victim, /particles/void_kidnap) kidnapping = TRUE - if(do_after(parent, kidnap_time, victim, extra_checks = victim.incapacitated)) + if(do_after(parent, kidnap_time, victim, extra_checks = CALLBACK(src, PROC_REF(check_incapacitated), victim))) take_them(victim) qdel(particles) @@ -67,3 +67,6 @@ /datum/component/space_kidnap/proc/succesfully_kidnapped(mob/living/carbon/human/kidnappee) SEND_SIGNAL(parent, COMSIG_VOIDWALKER_SUCCESFUL_KIDNAP, kidnappee) + +/datum/component/space_kidnap/proc/check_incapacitated(mob/living/carbon/human/kidnappee) + return kidnappee.incapacitated