cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Ready] Refactors stuns and status effects. (#17579)

Browse Source 
* Fixes reviver runtime

* Confusion status effect

* Dizzy status effect

* Drowsiness status effect

* decaying -> transient

* Drunkenness status effect

* why use timer when SSfastprocessing work good

* stuns (mostly)

* weaken and immobalise

* stun/weaken times

* update_flags redundancies.

* Slowed()

* Silence + fixes transient decay

* Jittery

* sleeping

* Paralyze -> weaken

* Cult sluring

* paralyse

* Stammer

* slurring + projectile cleanups

* losebreath

* Hallucination

* forgor this

* eyeblurry

* eye blind

* Druggy

* affected didn't like my spacing

* review pass

* second review pass

* some cleanups

* documentation and signal framework

* confusion fix

* Fixes spec_stun

* rejuv fix

* removes a TODO

* conflicted myself

* fixes

* self review

* review

* removes TODOs

* adminfreeze

* TM fixes

* hallucination fix + others

* tones down alchol and runtime fixes

* confusion overlay suggestion

* more fixes

* runtime fix

* losebreath fix

* clamp => directional bounded sum

* steel review

* oops

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* reduces the dizziness cycle rate

* borg hotfix

* sanctified decursening

Co-authored-by: mochi <1496804+dearmochi@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
This commit is contained in:
Charlie
2022-05-24 16:35:26 +01:00
committed by GitHub
co-authored by SteelSlayer mochi
parent b32fb92770
commit 0f7a8707ef
311 changed files with 2268 additions and 2155 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/martial_arts/combos/cqc/kick.dm
+1 -1
View File
@@ -18,7 +18,7 @@
target.visible_message("<span class='warning'>[user] kicks [target]'s head, knocking [target.p_them()] out!</span>", \
"<span class='userdanger'>[user] kicks your head, knocking you out!</span>")
playsound(get_turf(user), 'sound/weapons/genhit1.ogg', 50, 1, -1)
target.SetSleeping(15)
target.SetSleeping(30 SECONDS)
target.adjustBrainLoss(15)
add_attack_logs(user, target, "Knocked out with martial-art [src] : Kick", ATKLOG_ALL)
. = MARTIAL_COMBO_DONE
code/modules/martial_arts/combos/cqc/restrain.dm
+1 -1
View File
@@ -14,7 +14,7 @@
target.visible_message("<span class='warning'>[user] locks [target] into a restraining position!</span>", \
"<span class='userdanger'>[user] locks you into a restraining position!</span>")
target.adjustStaminaLoss(20)
target.Stun(5)
target.Stun(10 SECONDS)
CQC.restraining = TRUE
addtimer(CALLBACK(CQC, /datum/martial_art/cqc/.proc/drop_restraining), 50, TIMER_UNIQUE)
add_attack_logs(user, target, "Melee attacked with martial-art [src] : Restrain", ATKLOG_ALL)
code/modules/martial_arts/combos/cqc/slam.dm
+1 -1
View File
@@ -10,7 +10,7 @@
"<span class='userdanger'>[user] slams you into the ground!</span>")
playsound(get_turf(user), 'sound/weapons/slam.ogg', 50, 1, -1)
target.apply_damage(10, BRUTE)
target.Weaken(6)
target.Weaken(12 SECONDS)
add_attack_logs(user, target, "Melee attacked with martial-art [src] : Slam", ATKLOG_ALL)
return MARTIAL_COMBO_DONE
return MARTIAL_COMBO_FAIL
code/modules/martial_arts/combos/krav_maga/leg_sweep.dm
+1 -1
View File
@@ -16,7 +16,7 @@
"<span class='userdanger'>[user] leg sweeps you!</span>")
playsound(get_turf(user), 'sound/effects/hit_kick.ogg', 50, 1, -1)
target.apply_damage(5, BRUTE)
target.Weaken(2)
target.Weaken(4 SECONDS)
add_attack_logs(user, target, "Melee attacked with martial-art [src] : Leg Sweep", ATKLOG_ALL)
user.mind.martial_art.in_stance = FALSE
return MARTIAL_COMBO_DONE_CLEAR_COMBOS
code/modules/martial_arts/combos/krav_maga/lung_punch.dm
+1 -1
View File
@@ -7,7 +7,7 @@
target.visible_message("<span class='warning'>[user] pounds [target] on the chest!</span>", \
"<span class='userdanger'>[user] slams your chest! You can't breathe!</span>")
playsound(get_turf(user), 'sound/effects/hit_punch.ogg', 50, 1, -1)
target.AdjustLoseBreath(5)
target.AdjustLoseBreath(10 SECONDS)
target.adjustOxyLoss(10)
add_attack_logs(user, target, "Melee attacked with martial-art [src] : Lung Punch", ATKLOG_ALL)
user.mind.martial_art.in_stance = FALSE
code/modules/martial_arts/combos/krav_maga/neck_chop.dm
+1 -1
View File
@@ -8,7 +8,7 @@
"<span class='userdanger'>[user] karate chops your neck, rendering you unable to speak for a short time!</span>")
playsound(get_turf(user), 'sound/effects/hit_punch.ogg', 50, 1, -1)
target.apply_damage(5, BRUTE, BODY_ZONE_HEAD)
target.AdjustSilence(10)
target.AdjustSilence(20 SECONDS)
add_attack_logs(user, target, "Melee attacked with martial-art [src] : Neck Chop", ATKLOG_ALL)
user.mind.martial_art.in_stance = FALSE
return MARTIAL_COMBO_DONE_CLEAR_COMBOS
code/modules/martial_arts/combos/mimejutsu/mimechucks.dm
+1 -1
View File
@@ -4,7 +4,7 @@
explaination_text = "Hits the opponent with invisible nunchucks."
/datum/martial_combo/mimejutsu/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA)
if(!target.stat && !target.stunned && !target.IsWeakened())
if(!target.stat && !target.IsStunned() && !target.IsWeakened())
var/damage = rand(5, 8) + user.dna.species.punchdamagelow
if(!damage)
playsound(target.loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
code/modules/martial_arts/combos/mimejutsu/silent_palm.dm
+1 -1
View File
@@ -4,7 +4,7 @@
explaination_text = "Use mime energy to throw someone back."
/datum/martial_combo/mimejutsu/silent_palm/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA)
if(!target.stat && !target.stunned && !target.IsWeakened())
if(!target.stat && !target.IsStunned() && !target.IsWeakened())
target.visible_message("<span class='danger'>[user] has barely touched [target] with [user.p_their()] palm!</span>", \
"<span class='userdanger'>[user] hovers [user.p_their()] palm over your face!</span>")
code/modules/martial_arts/combos/sleeping_carp/keelhaul.dm
+1 -1
View File
@@ -8,7 +8,7 @@
playsound(get_turf(target), 'sound/effects/hit_kick.ogg', 50, TRUE, -1)
if(!target.IsWeakened() && !target.resting && !target.stat)
target.apply_damage(10, BRUTE, BODY_ZONE_HEAD)
target.Weaken(2)
target.Weaken(4 SECONDS)
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