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

migrates /obj/effect to the new attack chain (#28066)

Browse Source 
* the great migration

* pleasing the linter

* whoops

* smol fixes

* review

* hallucination attack proc

---------

Co-authored-by: Toastical <toast@toaster.com>
Co-authored-by: Toastical <toastical@toaster.com>
This commit is contained in:
Toastical
2025-02-26 09:45:18 +00:00
committed by GitHub
co-authored by Toastical Toastical
parent 6ded7786fd
commit 202249a137
18 changed files with 109 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hallucinations/effects/common.dm
+2 -2
View File
@@ -101,7 +101,7 @@
if(was_weakened && !should_attack_weakened)
return
attack__legacy__attackchain(was_weakened)
attacker_attack(was_weakened)
/**
* Called every Think when we are attacking the target.
@@ -109,7 +109,7 @@
* Arguments:
* * was_weakened - Whether the target was already knocked down prior to this attack.
*/
/obj/effect/hallucination/chaser/attacker/proc/attack__legacy__attackchain(was_weakened)
/obj/effect/hallucination/chaser/attacker/proc/attacker_attack(was_weakened)
dir = get_dir(src, target)
attack_effects()
target.apply_damage(damage, STAMINA)
code/modules/hallucinations/effects/major.dm
+5 -5
View File
@@ -68,15 +68,15 @@
target.visible_message("<span class='warning'>[target] trips over nothing.</span>",
"<span class='userdanger'>You get stuck in [src]!</span>")
/obj/effect/hallucination/tripper/spider_web/attackby__legacy__attackchain(obj/item/I, mob/user, params)
/obj/effect/hallucination/tripper/spider_web/item_interaction(mob/living/user, obj/item/used, list/modifiers)
if(user != target)
return
return ITEM_INTERACT_COMPLETE
step_towards(target, get_turf(src))
target.Weaken(4 SECONDS)
target.visible_message("<span class='warning'>[target] flails [target.p_their()] [I.name] as if striking something, only to trip!</span>",
"<span class='userdanger'>[src] vanishes as you strike it with [I], causing you to stumble forward!</span>")
target.visible_message("<span class='warning'>[target] flails [target.p_their()] [used.name] as if striking something, only to trip!</span>",
"<span class='userdanger'>[src] vanishes as you strike it with [used], causing you to stumble forward!</span>")
qdel(src)
return ITEM_INTERACT_COMPLETE
/**
* # Hallucination - Abduction