From cd747b01fec789bb632c48e5b204f8fda8d05fff Mon Sep 17 00:00:00 2001 From: Cognition Date: Fri, 17 Sep 2021 02:59:31 -0700 Subject: [PATCH] realized I can't place it on tables with how I set it up, woops. --- .../xenobiology/crossbreeding/regenerative.dm | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/code/modules/research/xenobiology/crossbreeding/regenerative.dm b/code/modules/research/xenobiology/crossbreeding/regenerative.dm index 2503190c58..43c25f2c0f 100644 --- a/code/modules/research/xenobiology/crossbreeding/regenerative.dm +++ b/code/modules/research/xenobiology/crossbreeding/regenerative.dm @@ -15,22 +15,23 @@ Regenerative extracts: return /obj/item/slimecross/regenerative/pre_attack(atom/A, mob/living/user, params, attackchain_flags, damage_multiplier) - if(!isliving(A)) - return TRUE //returning TRUE preemptively ends the attack chain and thus doesn't call afterattack, this is noteworthy for below as well - var/mob/living/M = A - if(M.stat == DEAD) - to_chat(user, "[src] will not work on the dead!") - return TRUE - //inform the target that they're about to have a regenerative extract used on them - if(M != user) - M.visible_message("[user] readies [src], holding it steady near [M] and guiding it to the center of [M.p_their()] mass...", - "[user] readies [src], holding it steady near you and guiding it to the center of your mass...") + if(isliving(A)) + var/mob/living/M = A + if(M.stat == DEAD) + to_chat(user, "[src] will not work on the dead!") + return TRUE //returning TRUE preemptively ends the attack chain and thus doesn't call afterattack, this is noteworthy for below as well + //inform the target that they're about to have a regenerative extract used on them + if(M != user) + M.visible_message("[user] readies [src], holding it steady near [M] and guiding it to the center of [M.p_their()] mass...", + "[user] readies [src], holding it steady near you and guiding it to the center of your mass...") + else + M.visible_message("[user] readies [src], holding it steady near [user.p_them()]self and guiding it to the center of [user.p_their()] mass...", + "You ready [src], holding it steady near you and guiding it to the center of your mass...") + if(!do_after(user, 50, target = M)) //5 seconds + return TRUE + . = ..() else - M.visible_message("[user] readies [src], holding it steady near [user.p_them()]self and guiding it to the center of [user.p_their()] mass...", - "You ready [src], holding it steady near you and guiding it to the center of your mass...") - if(!do_after(user, 50, target = M)) //5 seconds - return TRUE - . = ..() + . = ..() /obj/item/slimecross/regenerative/afterattack(atom/target,mob/user,prox) . = ..()