cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-12 07:33:34 +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/hydroponics/grown/banana.dm
+1 -1
View File
@@ -127,7 +127,7 @@
desc = "A synthetic banana peel."
/obj/item/grown/bananapeel/specialpeel/ComponentInitialize()
AddComponent(/datum/component/slippery, src, 2, 2, 100, 0, FALSE)
AddComponent(/datum/component/slippery, src, 4 SECONDS, 100, 0, FALSE)
/obj/item/grown/bananapeel/specialpeel/after_slip(mob/living/carbon/human/H)
. = ..()
code/modules/hydroponics/grown/nettle.dm
+6 -4
View File
@@ -99,7 +99,7 @@
/obj/item/grown/nettle/death/pickup(mob/living/carbon/user)
if(..())
if(prob(50))
user.Weaken(5)
user.Weaken(10 SECONDS)
to_chat(user, "<span class='userdanger'>You are stunned by the Deathnettle when you try picking it up!</span>")
/obj/item/grown/nettle/death/attack(mob/living/carbon/M, mob/user)
@@ -108,8 +108,10 @@
to_chat(M, "<span class='danger'>You are stunned by the powerful acid of the Deathnettle!</span>")
add_attack_logs(user, M, "Hit with [src]")
M.AdjustEyeBlurry(force/7)
M.AdjustEyeBlurry((force / 7) STATUS_EFFECT_CONSTANT)
if(prob(20))
M.Paralyse(force / 6)
M.Weaken(force / 15)
var/paralyze_time = (force * 10 / 3) SECONDS
var/stun_time = (force / 7.5) SECONDS
M.Paralyse(paralyze_time)
M.Weaken(stun_time)
M.drop_item()
code/modules/hydroponics/plant_genes.dm
+3 -3
View File
@@ -211,14 +211,14 @@
if(istype(G) && ispath(G.trash, /obj/item/grown))
return
var/stun_len = G.seed.potency * rate * 0.8
var/stun_len = G.seed.potency * rate * 1.6 SECONDS
if(!istype(G, /obj/item/grown/bananapeel) && (!G.reagents || !G.reagents.has_reagent("lube")))
stun_len /= 3
stun_len = min(stun_len, 7) // No fun allowed
stun_len = min(stun_len, 14 SECONDS)// No fun allowed
G.AddComponent(/datum/component/slippery, G, stun_len, stun_len, 100, 0, FALSE)
G.AddComponent(/datum/component/slippery, G, stun_len, 100, 0, FALSE)
/datum/plant_gene/trait/cell_charge
// Cell recharging trait. Charges all mob's power cells to (potency*rate)% mark when eaten.