Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

carp #5409

Merged
merged 1 commit into from
Feb 14, 2025
Merged

carp #5409

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tff_modular/modules/martial/sleeping_carp.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/datum/martial_art/the_sleeping_carp/can_deflect(mob/living/carp_user)
if(!carp_user.throw_mode)
if(!carp_user.combat_mode)
return FALSE
return is_capable(carp_user);

Expand Down Expand Up @@ -79,7 +79,7 @@
However, you are also unable to use any ranged weaponry. You can learn more about your newfound art by using the Recall Teachings verb in the Sleeping Carp tab.</span>"

/datum/uplink_item/stealthy_weapons/martialarts
cost = 13
cost = 17

/datum/martial_art/the_sleeping_carp
help_verb = /mob/living/proc/sleeping_carp_help_tff
Loading