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

Removes instant stuns from Sleeping Carp #18219

Merged
merged 3 commits into from
Jul 6, 2022
Merged

Removes instant stuns from Sleeping Carp #18219

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b8e40f
open rp, kicks ur ass
Inadvizable Jul 5, 2022
ece01e5
Stay down
Inadvizable Jul 6, 2022
1fe8b5c
Get your fins off me!
Inadvizable Jul 6, 2022
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
6 changes: 4 additions & 2 deletions code/modules/martial_arts/combos/sleeping_carp/keelhaul.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@
/datum/martial_combo/sleeping_carp/keelhaul/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA)
user.do_attack_animation(target, ATTACK_EFFECT_KICK)
playsound(get_turf(target), 'sound/effects/hit_kick.ogg', 50, TRUE, -1)
if(!target.IsWeakened() && !IS_HORIZONTAL(target) && !target.stat)
if(!IS_HORIZONTAL(target))
target.apply_damage(10, BRUTE, BODY_ZONE_HEAD)
target.Weaken(4 SECONDS)
target.KnockDown(4 SECONDS)
Inadvizable marked this conversation as resolved.
Show resolved Hide resolved
target.visible_message("<span class='warning'>[user] kicks [target] in the head, sending them face first into the floor!</span>",
"<span class='userdanger'>You are kicked in the head by [user], sending you crashing to the floor!</span>")
else
target.apply_damage(5, BRUTE, BODY_ZONE_HEAD)
target.drop_l_hand()
target.drop_r_hand()
target.visible_message("<span class='warning'>[user] kicks [target] in the head, leaving them reeling in pain!</span>",
"<span class='userdanger'>You are kicked in the head by [user], and you reel in pain!</span>")
target.apply_damage(40, STAMINA)
Expand Down