From cde626fe9919d7fe2f2b27a901caf43a89341b55 Mon Sep 17 00:00:00 2001 From: Stutternov <47883419+Stutternov@users.noreply.github.com> Date: Sun, 24 May 2026 20:07:25 -0400 Subject: [PATCH 1/4] Update protean.dm --- .../powers/code/discipline/protean/protean.dm | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/modular_darkpack/modules/powers/code/discipline/protean/protean.dm b/modular_darkpack/modules/powers/code/discipline/protean/protean.dm index 6bcfcaaf2343..33b7b111bf48 100644 --- a/modular_darkpack/modules/powers/code/discipline/protean/protean.dm +++ b/modular_darkpack/modules/powers/code/discipline/protean/protean.dm @@ -71,6 +71,14 @@ grouped_powers = list() +/datum/discipline_power/protean/feral_claws/pre_activation_checks(atom/target) + . = ..() + if(do_after(owner, 1 TURNS, timed_action_flags = IGNORE_USER_LOC_CHANGE)) + return TRUE + else + to_chat(owner, span_warning("You are unable rendered unable to transform!")) + return FALSE + /datum/discipline_power/protean/feral_claws/activate() . = ..() owner.drop_all_held_items() @@ -158,6 +166,14 @@ var/datum/action/cooldown/spell/shapeshift/gangrel/beast_form/gangy_form +/datum/discipline_power/protean/shape_of_the_beast/pre_activation_checks(atom/target) + . = ..() + if(do_after(owner, 3 TURNS, timed_action_flags = IGNORE_USER_LOC_CHANGE)) + return TRUE + else + to_chat(owner, span_warning("You are unable rendered unable to transform!")) + return FALSE + /datum/discipline_power/protean/shape_of_the_beast/activate() . = ..() if(gangy_form) @@ -198,6 +214,14 @@ var/datum/action/cooldown/spell/shapeshift/gangrel/mist/mist_form +/datum/discipline_power/protean/mist_form/pre_activation_checks(atom/target) + . = ..() + if(do_after(owner, 3 TURNS, timed_action_flags = IGNORE_USER_LOC_CHANGE)) + return TRUE + else + to_chat(owner, span_warning("You are unable rendered unable to transform!")) + return FALSE + /datum/discipline_power/protean/mist_form/activate() . = ..() if(mist_form) From dfcb9aa87b32ae1a6ae509e780fa5337baf5d249 Mon Sep 17 00:00:00 2001 From: Stutternov <47883419+Stutternov@users.noreply.github.com> Date: Mon, 25 May 2026 23:22:50 -0400 Subject: [PATCH 2/4] Update protean.dm Co-authored-by: chazzyjazzy <33268885+chazzyjazzy@users.noreply.github.com> --- .../modules/powers/code/discipline/protean/protean.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_darkpack/modules/powers/code/discipline/protean/protean.dm b/modular_darkpack/modules/powers/code/discipline/protean/protean.dm index 33b7b111bf48..d313e6eca378 100644 --- a/modular_darkpack/modules/powers/code/discipline/protean/protean.dm +++ b/modular_darkpack/modules/powers/code/discipline/protean/protean.dm @@ -76,7 +76,7 @@ if(do_after(owner, 1 TURNS, timed_action_flags = IGNORE_USER_LOC_CHANGE)) return TRUE else - to_chat(owner, span_warning("You are unable rendered unable to transform!")) + to_chat(owner, span_warning("You are rendered unable to transform!")) return FALSE /datum/discipline_power/protean/feral_claws/activate() From 87bd371b189e8116232e0f1fd72ca49695cdae52 Mon Sep 17 00:00:00 2001 From: Stutternov <47883419+Stutternov@users.noreply.github.com> Date: Mon, 25 May 2026 23:22:56 -0400 Subject: [PATCH 3/4] Update protean.dm Co-authored-by: chazzyjazzy <33268885+chazzyjazzy@users.noreply.github.com> --- .../modules/powers/code/discipline/protean/protean.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_darkpack/modules/powers/code/discipline/protean/protean.dm b/modular_darkpack/modules/powers/code/discipline/protean/protean.dm index d313e6eca378..19fe34ddabc8 100644 --- a/modular_darkpack/modules/powers/code/discipline/protean/protean.dm +++ b/modular_darkpack/modules/powers/code/discipline/protean/protean.dm @@ -171,7 +171,7 @@ if(do_after(owner, 3 TURNS, timed_action_flags = IGNORE_USER_LOC_CHANGE)) return TRUE else - to_chat(owner, span_warning("You are unable rendered unable to transform!")) + to_chat(owner, span_warning("You are rendered unable to transform!")) return FALSE /datum/discipline_power/protean/shape_of_the_beast/activate() From f1d43c75f5bd07fbe6b8f8122c54afb5d92b875c Mon Sep 17 00:00:00 2001 From: Stutternov <47883419+Stutternov@users.noreply.github.com> Date: Mon, 25 May 2026 23:23:01 -0400 Subject: [PATCH 4/4] Update protean.dm Co-authored-by: chazzyjazzy <33268885+chazzyjazzy@users.noreply.github.com> --- .../modules/powers/code/discipline/protean/protean.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_darkpack/modules/powers/code/discipline/protean/protean.dm b/modular_darkpack/modules/powers/code/discipline/protean/protean.dm index 19fe34ddabc8..90bda291fa83 100644 --- a/modular_darkpack/modules/powers/code/discipline/protean/protean.dm +++ b/modular_darkpack/modules/powers/code/discipline/protean/protean.dm @@ -219,7 +219,7 @@ if(do_after(owner, 3 TURNS, timed_action_flags = IGNORE_USER_LOC_CHANGE)) return TRUE else - to_chat(owner, span_warning("You are unable rendered unable to transform!")) + to_chat(owner, span_warning("You are rendered unable to transform!")) return FALSE /datum/discipline_power/protean/mist_form/activate()