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

fixes deleted cultists still being considered cultists (#24336)

Browse Source
This commit is contained in:
GDN
2024-03-06 08:28:18 -06:00
committed by GitHub
parent 980af06a6b
commit 00c0f22788
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/constructs.dm
+5 -2
View File
@@ -57,7 +57,6 @@
return ..()
/mob/living/simple_animal/hostile/construct/death(gibbed)
SSticker.mode.remove_cultist(show_message = FALSE, target_mob = src)
if(held_body) // Null check for empty bodies
held_body.forceMove(get_turf(src))
SSticker.mode.add_cult_immunity(held_body)
@@ -71,7 +70,11 @@
held_body.cancel_camera()
new /obj/effect/temp_visual/cult/sparks(get_turf(src))
playsound(src, 'sound/effects/pylon_shatter.ogg', 40, TRUE)
. = ..()
return ..()
/mob/living/simple_animal/hostile/construct/Destroy()
SSticker.mode.remove_cultist(show_message = FALSE, target_mob = src)
return ..()
/mob/living/simple_animal/hostile/construct/proc/add_held_body(atom/movable/body)
held_body = body
code/modules/mob/living/simple_animal/shade.dm
+2 -2
View File
@@ -38,9 +38,9 @@
. = ..()
icon_state = SSticker.cultdat?.shade_icon_state
/mob/living/simple_animal/shade/death(gibbed)
. = ..()
/mob/living/simple_animal/shade/Destroy()
SSticker.mode.remove_cultist(show_message = FALSE, target_mob = src)
return ..()
/mob/living/simple_animal/shade/attackby(obj/item/O, mob/user) //Marker -Agouri
if(istype(O, /obj/item/soulstone))