From 3754928689fd3c31442c313bd7e442a7a2d7ded0 Mon Sep 17 00:00:00 2001 From: NullFag Date: Sun, 11 Aug 2024 01:44:21 +0200 Subject: [PATCH] sssssssssssssssssssssssssssssss --- modular_zzplurt/code/modules/species/teshari.dm | 6 +++--- modular_zzplurt/code/modules/species/xeno.dm | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modular_zzplurt/code/modules/species/teshari.dm b/modular_zzplurt/code/modules/species/teshari.dm index 8ee2fbbfa3558..4cbbfda92c0ce 100644 --- a/modular_zzplurt/code/modules/species/teshari.dm +++ b/modular_zzplurt/code/modules/species/teshari.dm @@ -28,7 +28,7 @@ /datum/action/cooldown/sonar_ping/Activate(atom/target) var/heard_something = FALSE - to_chat(src, span_notice("You take a moment to listen in to your environment...")) + to_chat(owner, span_notice("You take a moment to listen in to your environment...")) for(var/mob/living/living in range(owner.client?.view, owner)) if(living == owner || living.stat == DEAD) continue @@ -57,10 +57,10 @@ feedback += "right on top of you." heard_something = TRUE - to_chat(src, span_notice(jointext(feedback, null))) + to_chat(owner, span_notice(jointext(feedback, null))) if(!heard_something) - to_chat(src, "You hear no movement but your own.") + to_chat(owner, span_notice("You hear no movement but your own.")) StartCooldown() return TRUE diff --git a/modular_zzplurt/code/modules/species/xeno.dm b/modular_zzplurt/code/modules/species/xeno.dm index 9479cd979df11..1ff5654ac7e6f 100644 --- a/modular_zzplurt/code/modules/species/xeno.dm +++ b/modular_zzplurt/code/modules/species/xeno.dm @@ -3,12 +3,10 @@ /datum/species/xeno/on_species_gain(mob/living/carbon/human/human_who_gained_species, datum/species/old_species, pref_load) . = ..() var/datum/action/innate/reconstitute_form/reconstitute_form = new(human_who_gained_species) //shit ahh var name + var/datum/action/cooldown/sonar_ping/sonar_ping = new(human_who_gained_species) reconstitute_form.Grant(human_who_gained_species) + sonar_ping.Grant(human_who_gained_species) - - // C.verbs += /mob/living/carbon/human/proc/reconstitute_form - // C.verbs += /mob/living/carbon/human/proc/sonar_ping - // C.verbs += /mob/living/carbon/human/proc/tie_hair human_who_gained_species.add_movespeed_modifier(/datum/movespeed_modifier/xenochimera) /datum/species/xeno/on_species_loss(mob/living/carbon/human/C, datum/species/new_species, pref_load) @@ -59,7 +57,9 @@ if(tgui_alert(owner, alert, "Confirm Regeneration", list("Yes", "No")) != "Yes") return FALSE - to_chat(src, "You begin to reconstruct your form. You will not be able to move during this time. It should take aproximately [round(time)] seconds.") + to_chat(owner, "You begin to reconstruct your form. You will not be able to move during this time. It should take aproximately [round(time)] seconds.") + owner.Stun(INFINITY, TRUE) + revive_timer = addtimer(CALLBACK(src, PROC_REF(ready_revive)), time, TIMER_UNIQUE | TIMER_STOPPABLE) if(owner.stat == DEAD) RegisterSignal(owner, COMSIG_LIVING_REVIVE, PROC_REF(on_revive))