cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 19:44:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Moves the silence of CQC Kick to Consecutive CQC (#31486)

Browse Source 
* Initial

* woopsies
This commit is contained in:
iramoye
2026-01-28 09:58:07 -06:00
committed by GitHub
parent 6cff00a20c
commit 4cc91d7447
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/martial_arts/combos/cqc/consecutive.dm
+2 -1
View File
@@ -1,7 +1,7 @@
/datum/martial_combo/cqc/consecutive
name = "Consecutive CQC"
steps = list(MARTIAL_COMBO_STEP_DISARM, MARTIAL_COMBO_STEP_DISARM, MARTIAL_COMBO_STEP_HARM)
explaination_text = "Mainly offensive move, dealing some brute damage, and huge amounts of stamina damage"
explaination_text = "Mainly offensive move, dealing some brute damage, huge amounts of stamina damage, and muting targets."
/datum/martial_combo/cqc/consecutive/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA)
if(!target.stat)
@@ -10,6 +10,7 @@
playsound(get_turf(target), 'sound/weapons/cqchit2.ogg', 50, TRUE, -1)
target.apply_damage(70, STAMINA)
target.apply_damage(20, BRUTE)
target.Silence(3 SECONDS)
add_attack_logs(user, target, "Melee attacked with martial-art [src] : Consecutive", ATKLOG_ALL)
return MARTIAL_COMBO_DONE
return MARTIAL_COMBO_FAIL
code/modules/martial_arts/combos/cqc/kick.dm
+1 -2
View File
@@ -1,7 +1,7 @@
/datum/martial_combo/cqc/kick
name = "CQC Kick"
steps = list(MARTIAL_COMBO_STEP_HARM, MARTIAL_COMBO_STEP_HARM)
explaination_text = "Knocks opponent away and slows them. Will instead deal massive stamina damage, inflict minor brain damage, and mute opponents who are on the ground."
explaination_text = "Knocks opponent away and slows them. Will instead deal massive stamina damage and inflict minor brain damage to those who are on the ground."
/datum/martial_combo/cqc/kick/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA)
. = MARTIAL_COMBO_FAIL
@@ -23,6 +23,5 @@
target.throw_at(throw_target, 1, 8, user)
target.apply_damage(40, STAMINA)
target.adjustBrainLoss(10)
target.Silence(3 SECONDS)
add_attack_logs(user, target, "Kicked in the head with martial-art [src] : Kick", ATKLOG_ALL)
. = MARTIAL_COMBO_DONE