diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index 48950c459ce..2993c6747ba 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -692,7 +692,9 @@ /obj/item/portal_amulet/afterattack(atom/O, mob/user, proximity) . = ..() - if(!iscultist(user) && iscarbon(user)) + if(!iscultist(user)) + if(!carbon(user)) + return var/mob/living/carbon/M = user to_chat(M, "\"So, you want to explore space?\"") to_chat(M, "Space flashes around you as you are moved somewhere else!") @@ -763,7 +765,7 @@ var/obj/effect/cult_portal_exit/exit = null /obj/effect/portal/cult/Initialize(mapload, target, creator, lifespan) - ..() + . = ..() if(target) exit = new /obj/effect/cult_portal_exit(target) @@ -776,8 +778,7 @@ return ..() /obj/effect/portal/cult/Destroy() - if(exit) - QDEL_NULL(exit) + QDEL_NULL(exit) return ..() /obj/effect/cult_portal_exit