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

wooohoo! I can see demons! (#19020)

Browse Source
This commit is contained in:
Contrabang
2022-09-12 22:31:59 +01:00
committed by GitHub
parent 5e72865320
commit e88b25bb24
4 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/mobs.dm
+10 -9
View File
@@ -236,15 +236,16 @@
#define iswryn(A) (is_species(A, /datum/species/wryn))
#define ismoth(A) (is_species(A, /datum/species/moth))
#define isanimal(A) (istype((A), /mob/living/simple_animal))
#define isdog(A) (istype((A), /mob/living/simple_animal/pet/dog))
#define iscorgi(A) (istype((A), /mob/living/simple_animal/pet/dog/corgi))
#define ismouse(A) (istype((A), /mob/living/simple_animal/mouse))
#define isbot(A) (istype((A), /mob/living/simple_animal/bot))
#define isguardian(A) (istype((A), /mob/living/simple_animal/hostile/guardian))
#define isnymph(A) (istype((A), /mob/living/simple_animal/diona))
#define ishostile(A) (istype(A, /mob/living/simple_animal/hostile))
#define isterrorspider(A) (istype((A), /mob/living/simple_animal/hostile/poison/terror_spider))
#define isanimal(A) (istype((A), /mob/living/simple_animal))
#define isdog(A) (istype((A), /mob/living/simple_animal/pet/dog))
#define iscorgi(A) (istype((A), /mob/living/simple_animal/pet/dog/corgi))
#define ismouse(A) (istype((A), /mob/living/simple_animal/mouse))
#define isbot(A) (istype((A), /mob/living/simple_animal/bot))
#define isguardian(A) (istype((A), /mob/living/simple_animal/hostile/guardian))
#define isnymph(A) (istype((A), /mob/living/simple_animal/diona))
#define ishostile(A) (istype((A), /mob/living/simple_animal/hostile))
#define isterrorspider(A) (istype((A), /mob/living/simple_animal/hostile/poison/terror_spider))
#define isslaughterdemon(A) (istype((A), /mob/living/simple_animal/slaughter))
#define issilicon(A) (istype((A), /mob/living/silicon))
#define isAI(A) (istype((A), /mob/living/silicon/ai))
code/game/gamemodes/miniantags/slaughter/bloodcrawl.dm
+2 -2
View File
@@ -59,7 +59,7 @@
if(animation)
qdel(animation)
var/sound
if(istype(src, /mob/living/simple_animal/slaughter))
if(isslaughterdemon(src))
var/mob/living/simple_animal/slaughter/SD = src
sound = SD.feast_sound
else
@@ -133,7 +133,7 @@
animation.master = B.loc
animation.dir = dir
if(prob(25) && istype(src, /mob/living/simple_animal/slaughter))
if(prob(25) && isslaughterdemon(src))
var/list/voice = list('sound/hallucinations/behind_you1.ogg','sound/hallucinations/im_here1.ogg','sound/hallucinations/turn_around1.ogg','sound/hallucinations/i_see_you1.ogg')
playsound(get_turf(src), pick(voice),50, 1, -1)
visible_message("<span class='warning'><B>\The [src] rises out of \the [B]!</B>")
code/game/gamemodes/miniantags/slaughter/slaughter.dm
+1 -1
View File
@@ -344,7 +344,7 @@
..()
/datum/objective/slaughter/check_completion()
if(!istype(owner.current, /mob/living/simple_animal/slaughter) || !owner.current)
if(!isslaughterdemon(owner.current) || !owner.current)
return 0
var/mob/living/simple_animal/slaughter/R = owner.current
if(!R || R.stat == DEAD)
code/modules/mob/dead/observer/orbit.dm
+4
View File
@@ -129,6 +129,10 @@
var/list/antag_serialized = serialized.Copy()
antag_serialized["antag"] = "Xenomorph"
antagonists += list(antag_serialized)
else if(isslaughterdemon(M))
var/list/antag_serialized = serialized.Copy()
antag_serialized["antag"] = "Slaughter Demon"
antagonists += list(antag_serialized)
else
misc += list(serialized)