cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-18 02:24:11 +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
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/ninja/martial_art.dm
+7 -5
View File
@@ -61,8 +61,9 @@
D.emote("scream")
D.drop_item()
D.apply_damage(5, BRUTE, pick("l_arm", "r_arm"))
D.Stun(1)
spawn(50) has_focus = 1
D.Stun(2 SECONDS)
spawn(50)
has_focus = 1
return 1
to_chat(A, "<span class='warning'>You are not focused enough to use that move yet!</span>")
return 0
@@ -106,7 +107,7 @@
to_chat(A, "<span class='warning'>You feel [D] go limp in your grip.</span>")
to_chat(D, "<span class='userdanger'>You feel your consciousness slip away as [A] strangles you!</span>")
D.AdjustParalysis(20)
D.AdjustParalysis(40 SECONDS)
has_choke_hold = 0
@@ -126,9 +127,10 @@
var/atom/throw_target = get_ranged_target_turf(D, get_dir(D, get_step_away(D, A)), 3) // Get a turf 3 tiles away from the target relative to our direction from him.
D.throw_at(throw_target, 200, 4) // Throw the poor bastard at the target we just gabbed.
D.Weaken(2)
D.Weaken(4 SECONDS)
playsound(get_turf(D), 'sound/weapons/punch1.ogg', 50, 1, -1)
spawn(50) has_focus = 1
spawn(50)
has_focus = 1
return 1
to_chat(A, "<span class='warning'>You are not focused enough to use that move yet!</span>")
return 0