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

Stunbaton delayed knockdown now respects antistuns (#21069)

Browse Source 
* stunbaton delayed knockdown now moved into status effect

* renaming proc to keep its meaning

* made STATUS_EFFECT_DELAYED as status effect for any delayed logic, removed STATUS_EFFECT_BATONNED

* cleanup, little bug fixing

* cleanup

* whoopsie

* updates

* signal string changed

* Update code/datums/status_effects/neutral.dm

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

---------

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
This commit is contained in:
HMBGERDO
2023-06-01 18:36:44 -05:00
committed by GitHub
co-authored by SteelSlayer
parent bdb8039c8f
commit 02db93e37e
10 changed files with 45 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/dcs/signals.dm
+2
View File
@@ -867,3 +867,5 @@
#define COMSIG_OBJECTIVE_CHECK_VALID_TARGET "objective_check_valid_target"
#define OBJECTIVE_VALID_TARGET (1<<0)
#define OBJECTIVE_INVALID_TARGET (1<<1)
#define COMSIG_LIVING_CLEAR_STUNS "living_clear_stuns"
code/__DEFINES/status_effects.dm
+3 -1
View File
@@ -74,6 +74,8 @@
#define STATUS_EFFECT_SUMMONEDGHOST /datum/status_effect/cultghost //is a cult ghost: can see dead people, can't manifest more ghosts
#define STATUS_EFFECT_DELAYED /datum/status_effect/delayed //delayed status effect: gets /datum/callback to call on expire, signal if we want to prevent and duration
#define STATUS_EFFECT_CRUSHERMARK /datum/status_effect/crusher_mark //if struck with a proto-kinetic crusher, takes a ton of damage
#define STATUS_EFFECT_SAWBLEED /datum/status_effect/saw_bleed //if the bleed builds up enough, takes a ton of damage
@@ -160,4 +162,4 @@
/// gives you fluff messages for cough, sneeze, headache, etc but without an actual virus
#define STATUS_EFFECT_FAKE_VIRUS /datum/status_effect/fake_virus
/// This status effect lets the user see the lwap dots.
#define STATUS_EFFECT_LWAPSCOPE /datum/status_effect/lwap_scope
#define STATUS_EFFECT_LWAPSCOPE /datum/status_effect/lwap_scope