diff --git a/code/modules/research/xenobiology/crossbreeding/regenerative.dm b/code/modules/research/xenobiology/crossbreeding/regenerative.dm
index 43c25f2c0f..dee7b1cf45 100644
--- a/code/modules/research/xenobiology/crossbreeding/regenerative.dm
+++ b/code/modules/research/xenobiology/crossbreeding/regenerative.dm
@@ -21,14 +21,16 @@ Regenerative extracts:
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)
+ if(M != user) //targeting someone else
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
+ if(!do_after(user, 50, target = M)) //5 seconds
+ return TRUE
+ else //targeting self
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
+ if(!do_after(user, 10, target = M)) //1 second
+ return TRUE
. = ..()
else
. = ..()
@@ -58,6 +60,7 @@ Regenerative extracts:
playsound(target, 'sound/effects/splat.ogg', 40, 1)
//warn receivers of the extract about the disgust if they're carbon, making it clear that the regenerative extract is causing this.
if(iscarbon(M))
+ var/obj/item/organ/stomach/S = M.getorganslot(ORGAN_SLOT_STOMACH) //for getting the stummy name
switch(new_disgust_level)
if(0 to DISGUST_LEVEL_GROSS)
to_chat(M,"While you recovered from [src], you feel a little nauseous.")
@@ -66,7 +69,7 @@ Regenerative extracts:
if(DISGUST_LEVEL_VERYGROSS to DISGUST_LEVEL_DISGUSTED)
to_chat(M,"While you recovered from [src], you feel like you're about to vomit!")
if(DISGUST_LEVEL_DISGUSTED to INFINITY)
- to_chat(M,"You feel absolutely sick. Maybe you should lay off the regenerative extracts until your stomach settles!")
+ to_chat(M,"You feel absolutely sick. Maybe you should lay off the regenerative extracts until your [(S ? S.name : "stomach")] settles!")
qdel(src)
/obj/item/slimecross/regenerative/grey