From 36f9727d4d0dcd6380b05d8a7604e795b8aebc95 Mon Sep 17 00:00:00 2001
From: Aurorablade <lemastera@gmail.com>
Date: Tue, 9 May 2017 03:39:53 -0400
Subject: [PATCH] fixes

---
 code/datums/mind.dm                  |  2 +-
 code/game/gamemodes/cult/cult.dm     | 10 ++--------
 code/game/machinery/doors/airlock.dm |  8 ++++++++
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index aa80b0fc63e..f2465145808 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -1332,7 +1332,7 @@
 		to_chat(current, "<font color=\"cultitalic\"><b><i>You catch a glimpse of the Realm of [ticker.mode.cultdat.entity_name], [ticker.mode.cultdat.entity_title2]. You now see how flimsy the world is, you see that it should be open to the knowledge of [ticker.mode.cultdat.entity_name].</b></i></font>")
 		to_chat(current, "<font color=\"cultitalic\"><b><i>Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back.</b></i></font>")
 		var/datum/game_mode/cult/cult = ticker.mode
-		if(istype(cult))
+		if(GAMEMODE_IS_CULT)
 			cult.memorize_cult_objectives(src)
 		else
 			var/explanation = "Summon [ticker.mode.cultdat.entity_name] via the use of the appropriate rune. It will only work if nine cultists stand on and around it."
diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm
index ff7c74a6fbb..4f4152e2e22 100644
--- a/code/game/gamemodes/cult/cult.dm
+++ b/code/game/gamemodes/cult/cult.dm
@@ -170,6 +170,7 @@ var/global/list/all_cults = list()
 /datum/game_mode/proc/add_cultist(datum/mind/cult_mind) //BASE
 	if(!istype(cult_mind))
 		return 0
+	var/datum/game_mode/cult/cult_mode = ticker.mode
 	if(!(cult_mind in cult) && is_convertable_to_cult(cult_mind))
 		cult += cult_mind
 		cult_mind.current.faction |= "cult"
@@ -179,18 +180,11 @@ var/global/list/all_cults = list()
 		if(jobban_isbanned(cult_mind.current, ROLE_CULTIST) || jobban_isbanned(cult_mind.current, ROLE_SYNDICATE))
 			replace_jobbanned_player(cult_mind.current, ROLE_CULTIST)
 		update_cult_icons_added(cult_mind)
+		cult_mode.memorize_cult_objectives(cult_mind)
 		if(GAMEMODE_IS_CULT)
-			var/datum/game_mode/cult/cult_mode = ticker.mode
 			cult_mode.check_numbers()
 		return 1
 
-
-/datum/game_mode/cult/add_cultist(datum/mind/cult_mind) //INHERIT
-	if(!..(cult_mind))
-		return
-	memorize_cult_objectives(cult_mind)
-
-
 /datum/game_mode/proc/remove_cultist(datum/mind/cult_mind, show_message = 1)
 	if(cult_mind in cult)
 		cult -= cult_mind
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index ac6e5e77d22..a0b72ed5074 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -1142,6 +1142,14 @@ About the new airlock wires panel:
 		open()
 		safe = TRUE
 
+/obj/machinery/door/airlock/narsie_act()
+	var/turf/T = get_turf(src)
+	if(prob(20))
+		new/obj/machinery/door/airlock/cult(T)
+		qdel(src)
+
+
+
 //////////////////////////////////
 /*
 	Cult Airlocks