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

Refactors slaughter, shadow, and pulse demons to basic mobs (#30660)

Browse Source 
* Refactors slaughter, shadow, and pulse demons to basic mobs

* Linters

* Fix

* Projectile changes

* Ensures demons speak common

* Update code/modules/mob/living/basic/hostile/demons/demon_powers.dm

Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
This commit is contained in:
PollardTheDragon
2025-11-25 19:47:12 +00:00
committed by GitHub
co-authored by Burzah
parent 989ff989d6
commit 0cfe0594be
25 changed files with 741 additions and 752 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/is_helpers.dm
+2 -2
View File
@@ -43,9 +43,9 @@
#define isslime(A) (istype((A), /mob/living/simple_animal/slime))
#define ispulsedemon(A) (istype(A, /mob/living/simple_animal/demon/pulse_demon))
#define ispulsedemon(A) (istype(A, /mob/living/basic/demon/pulse_demon))
#define isshadowdemon(A) (istype(A, /mob/living/simple_animal/demon/shadow))
#define isshadowdemon(A) (istype(A, /mob/living/basic/demon/shadow))
// Basic mobs
code/__DEFINES/mob_defines.dm
+2 -2
View File
@@ -256,8 +256,8 @@
#define ishostile(A) (istype((A), /mob/living/simple_animal/hostile))
#define isretaliate(A) (istype((A), /mob/living/simple_animal/hostile/retaliate))
#define isterrorspider(A) (istype((A), /mob/living/simple_animal/hostile/poison/terror_spider) || istype((A), /mob/living/basic/spiderling/terror_spiderling))
#define isslaughterdemon(A) (istype((A), /mob/living/simple_animal/demon/slaughter))
#define isdemon(A) (istype((A), /mob/living/simple_animal/demon))
#define isslaughterdemon(A) (istype((A), /mob/living/basic/demon/slaughter))
#define isdemon(A) (istype((A), /mob/living/basic/demon))
#define iscat(A) (istype((A), /mob/living/simple_animal/pet/cat))
#define isgorilla(A) (istype((A), /mob/living/basic/gorilla))
#define ismorph(A) (istype((A), /mob/living/simple_animal/hostile/morph))