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

Retaliate mobs no longer break stuff after revived with a laz injector. (#24665)

Browse Source
This commit is contained in:
Charlie Nolan
2024-03-18 18:25:35 +00:00
committed by GitHub
parent 13f0d607d6
commit a5aa7d923b
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/mob_defines.dm
+1
View File
@@ -241,6 +241,7 @@
#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 isretaliate(A) (istype((A), /mob/living/simple_animal/hostile/retaliate))
#define isterrorspider(A) (istype((A), /mob/living/simple_animal/hostile/poison/terror_spider))
#define isslaughterdemon(A) (istype((A), /mob/living/simple_animal/demon/slaughter))
#define isdemon(A) (istype((A), /mob/living/simple_animal/demon))
code/modules/mining/equipment/lazarus_injector.dm
+6
View File
@@ -29,6 +29,12 @@
M.can_collar = TRUE
if(ishostile(target))
var/mob/living/simple_animal/hostile/H = M
if(isretaliate(target))
// Clear the enemies list so we don't break windows
// to get to people we no longer hate.
var/mob/living/simple_animal/hostile/retaliate/R = H
R.enemies.Cut()
if(malfunctioning)
H.faction |= list("lazarus", "\ref[user]")
H.robust_searching = TRUE