Crazy lemon comments.

code/game/gamemodes/cult/cult_items.dm

@@ -268,7 +268,7 @@
 	var/uses = 4
 
 /obj/item/device/cult_shift/examine(mob/user)
-	..()
+	. = ..()
 	if(uses)
 		to_chat(user, "<span class='cult'>It has [uses] uses remaining.</span>")
 	else

code/game/gamemodes/cult/cult_objectives.dm

@@ -165,7 +165,7 @@
 			for(var/mob/living/carbon/human/player in player_list)
 				if(is_secure_level(player.z)) //We can't sacrifice people that are on the centcom z-level
 					continue
-				if(player.mind && !(player.mind in cult))
+				if(player.mind && !(player.mind in cult) && (player.stat != DEAD))//make DAMN sure they are not dead
 					possible_targets += player.mind
 
 		if(possible_targets.len > 0)
@@ -183,7 +183,7 @@
 				if(L.mind in cult)
 					living_cultists++
 				else
-					if(istype(L, /mob/living/carbon))
+					if(istype(L, /mob/living/carbon/human))
 						living_crew++
 
 		var/total = living_crew + living_cultists
@@ -211,7 +211,7 @@
 	else
 		return pick(possible_objectives)
 
-/datum/game_mode/cult/proc/pick_bonus_objective()
+/datum/game_mode/cult/proc/pick_bonus_objective()//did we summon demons? TIME FOR THE BONUS STAGE
 	var/list/possible_objectives = list()
 
 	var/living_crew = 0
@@ -240,20 +240,18 @@
 
 		if("hijack")
 			for(var/mob/living/L in player_list)
-				if(L.stat != DEAD)
-					if(!(L.mind in cult))
-						var/area/A = get_area(L)
-						if(is_type_in_list(A.loc, centcom_areas))
-							escaped_shuttle++
+				if(L.stat != DEAD && !(L.mind in cult))
+					var/area/A = get_area(L)
+					if(is_type_in_list(A.loc, centcom_areas))
+						escaped_shuttle++
 			if(!escaped_shuttle)
 				bonus = 1
 
 		if("massacre")
 			for(var/mob/living/carbon/C in player_list)
-				if(C.stat != DEAD)
-					if(!(C.mind in cult))
-						var/turf/T = get_turf(C)
-						if(is_station_level(T.z))	//we're only interested in the remaining humans on the station
-							survivors++
+				if(C.stat != DEAD && !(C.mind in cult))
+					var/turf/T = get_turf(C)
+					if(is_station_level(T.z))	//we're only interested in the remaining humans on the station
+						survivors++
 			if(survivors < massacre_target)
 				bonus = 1

code/game/gamemodes/cult/cult_structures.dm

@@ -42,7 +42,7 @@
 
 //Cult versions cuase fuck map conflicts
 /obj/structure/cult/examine(mob/user)
-	..()
+	. = ..()
 	if(iscultist(user) && cooldowntime > world.time)
 		to_chat(user, "<span class='cultitalic'>The magic in [src] is weak, it will be ready to use again in [getETA()].</span>")
 	to_chat(user, "<span class='notice'>\The [src] is [anchored ? "":"not "]secured to the floor.</span>")
@@ -86,7 +86,7 @@
 	if(cooldowntime > world.time)
 		to_chat(user, "<span class='cultitalic'>The magic in [src] is weak, it will be ready to use again in [getETA()].</span>")
 		return
-	var/choice = input(user,"You study the rituals on the alter...","Alter") as null|anything in list("Cultist Dagger", "Eldritch Whetstone","Zealot's Blindfold","Flask of Unholy Water")
+	var/choice = input(user,"You study the rituals on the altar...","Altar") as null|anything in list("Cultist Dagger", "Eldritch Whetstone","Zealot's Blindfold","Flask of Unholy Water")
 	var/pickedtype
 	switch(choice)
 		if("Eldritch Whetstone")
@@ -129,8 +129,10 @@
 		if(!C.stat)
 			C.emote("scream")
 		user.changeNext_move(CLICK_CD_MELEE)
-		C.apply_damage(30, BURN, "head") //30 fire damage because it's FUCKING LAVA
-		C.status_flags |= DISFIGURED //Your face is unrecognizable because it's FUCKING LAVA
+		var/obj/item/organ/external/head/head = C.get_organ("head")
+		if(head)
+			C.apply_damage(30, BURN, "head") //30 fire damage because it's FUCKING LAVA
+			head.disfigure("burn") //Your face is unrecognizable because it's FUCKING LAVA
 		return 1
 
 /obj/structure/cult/cultforge/attack_hand(mob/living/user)
@@ -209,7 +211,6 @@ var/list/blacklisted_pylon_turfs = typecacheof(list(
 						var/mob/living/simple_animal/M = L
 						if(M.health < M.maxHealth)
 							M.adjustHealth(-1)
-			//CHECK_TICK
 	if(last_corrupt <= world.time)
 		var/list/validturfs = list()
 		var/list/cultturfs = list()

code/game/gamemodes/cult/ritual.dm

@@ -1,4 +1,6 @@
 //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
+#define CULT_ELDERGOD "eldergod"
+#define CULT_SLAUGHTER "slaughter"
 
 /obj/effect/rune/proc/fizzle()
 	if(istype(src,/obj/effect/rune))
@@ -190,6 +192,38 @@
 	popup.open()
 	return 1
 
+/obj/item/weapon/tome/proc/finale_runes_ok(mob/living/user,/obj/effect/rune/rune_to_scribe)
+
+	if(ticker.mode.name == "cult")
+		if(!canbypass == 1)//not an admin-tome, check things
+			var/datum/game_mode/cult/cult_mode = ticker.mode
+			if(!cult_mode.narsie_condition_cleared)
+				to_chat(user, "<span class='warning'>There is still more to do before unleashing [cult_mode.cultdat.entity_name] power!</span>")
+				return 0
+			if(!cult_mode.eldergod)
+				to_chat(user, "<span class='cultlarge'>\"I am already here. There is no need to try to summon me now.\"</span>")
+				return 0
+			if(cult_mode.demons_summoned)
+				to_chat(user, "<span class='cultlarge'>\"We are already here. There is no need to try to summon us now.\"</span>")
+				return 0
+			if(!(CULT_ELDERGOD in cult_mode.objectives) || !(CULT_SLAUGHTER in cult_mode.objectives))
+				to_chat(user, "<span class='warning'>[cult_mode.cultdat.entity_name]'s power does not wish to be unleashed!</span>")
+				return 0
+			var/confirm_final = alert(user, "This is the FINAL step to summon your dietys power, it is a long, painful ritual and the crew will be alerted to your presence", "Are you prepared for the final battle?", "My life for Nar-Sie!", "No")
+			if(confirm_final == "No")
+				to_chat(user, "<span class='cult'>You decide to prepare further before scribing the rune.</span>")
+				return
+			else
+				return 1
+	else//the game mode is not cult..but we ARE a cultist...ALL ON THE ADMINBUS
+		if(!canbypass == 1)//not an admin-tome, check things
+			var/confirm_final = alert(user, "This is the FINAL step to summon your dietys power, it is a long, painful ritual and the crew will be alerted to your presence", "Are you prepared for the final battle?", "My life for Nar-Sie!", "No")
+			if(confirm_final == "No")
+				to_chat(user, "<span class='cult'>You decide to prepare further before scribing the rune.</span>")
+				return 0
+			else
+				return 1
+
 /obj/item/weapon/tome/proc/scribe_rune(mob/living/user)
 	var/turf/runeturf = get_turf(user)
 	var/chosen_keyword
@@ -228,26 +262,7 @@
 	if(!Adjacent(user) || !src || qdeleted(src) || user.incapacitated())
 		return
 	if(ispath(rune_to_scribe, /obj/effect/rune/narsie) || ispath(rune_to_scribe, /obj/effect/rune/slaughter))//may need to change this - Fethas
-
-		if(ticker.mode.name == "cult")
-			if(!canbypass == 1)//not an admin-tome, check things
-				var/datum/game_mode/cult/cult_mode = ticker.mode
-				if(!cult_mode.narsie_condition_cleared)
-					to_chat(user, "<span class='warning'>There is still more to do before unleashing [cult_mode.cultdat.entity_name] power!</span>")
-					return
-				if(!cult_mode.eldergod)
-					to_chat(user, "<span class='cultlarge'>\"I am already here. There is no need to try to summon me now.\"</span>")
-					return
-				if(cult_mode.demons_summoned)
-					to_chat(user, "<span class='cultlarge'>\"We are already here. There is no need to try to summon us now.\"</span>")
-					return
-				if(!("eldergod" in cult_mode.objectives) || !("slughter" in cult_mode.objectives))
-					to_chat(user, "<span class='warning'>[cult_mode.cultdat.entity_name]'s power does not wish to be unleashed!</span>")
-					return
-				var/confirm_final = alert(user, "This is the FINAL step to summon your dietys power, it is a long, painful ritual and the crew will be alerted to your presence", "Are you prepared for the final battle?", "My life for Nar-Sie!", "No")
-				if(confirm_final == "No")
-					to_chat(user, "<span class='cult'>You decide to prepare further before scribing the rune.</span>")
-					return
+		if(finale_runes_ok(user,rune_to_scribe))
 			command_announcement.Announce("Figments from an eldritch god are being summoned somwhere on the station from an unknown dimension. Disrupt the ritual at all costs!","Central Command Higher Dimensionsal Affairs", 'sound/AI/spanomalies.ogg')
 			for(var/B in spiral_range_turfs(1, user, 1))
 				var/turf/T = B
@@ -257,21 +272,6 @@
 				N.icon_state = "shield-cult"
 				N.health = 60
 				shields |= N
-		else//the game mode is not cult..but we ARE a cultist...ALL ON THE ADMINBUS
-			if(!canbypass == 1)//not an admin-tome, check things
-				var/confirm_final = alert(user, "This is the FINAL step to summon your dietys power, it is a long, painful ritual and the crew will be alerted to your presence", "Are you prepared for the final battle?", "My life for Nar-Sie!", "No")
-				if(confirm_final == "No")
-					to_chat(user, "<span class='cult'>You decide to prepare further before scribing the rune.</span>")
-					return
-				command_announcement.Announce("Figments from an eldritch god are being summoned somwhere on the station from an unknown dimension. Disrupt the ritual at all costs!","Central Command Higher Dimensionsal Affairs", 'sound/AI/spanomalies.ogg')
-				for(var/B in spiral_range_turfs(1, user, 1))
-					var/turf/T = B
-					var/obj/machinery/shield/N = new(T)
-					N.name = "Rune-Scriber's Shield"
-					N.desc = "A potent shield summoned by cultists to protect them while they prepare the final ritual"
-					N.icon_state = "shield-cult"
-					N.health = 60
-					shields |= N
 
 	var/mob/living/carbon/human/H = user
 	var/dam_zone = pick("head", "chest", "groin", "l_arm", "l_hand", "r_arm", "r_hand", "l_leg", "l_foot", "r_leg", "r_foot")

code/game/gamemodes/cult/runes.dm

@@ -564,7 +564,7 @@ var/list/teleport_runes = list()
 	var/mob/living/user = invokers[1]
 	if(istype(ticker.mode.name, "cult"))
 		var/datum/game_mode/cult/cult_mode = ticker.mode
-		if(!("slaughter" in cult_mode.objectives))
+		if(!(CULT_SLAUGHTER in cult_mode.objectives))
 			message_admins("[usr.real_name]([user.ckey]) tried to summon demons when the objective was wrong")
 			for(var/M in invokers)
 				var/mob/living/L = M

code/game/gamemodes/cult/talisman.dm

@@ -249,8 +249,8 @@
 			if(iscarbon(target))
 				var/mob/living/carbon/C = target
 				C.AdjustSilence(5)
-				C.stuttering += 15
-				C.cultslurring += 20
+				C.AdjustStuttering(15)
+				C.AdjustCultSlur(20)
 				C.Jitter(15)
 		user.drop_item()
 		qdel(src)

code/game/gamemodes/miniantags/slaughter/slaughter.dm

@@ -109,7 +109,7 @@
 
 /mob/living/simple_animal/slaughter/cult //Summoned as part of the cult objective "Bring the Slaughter"
 	name = "harbringer of the slaughter"
-	real_name = "harbringer of the slaughter"
+	real_name = "harbringer of the Slaughter"
 	desc = "An awful creature from beyond the realms of madness."
 	maxHealth = 500
 	health = 500
@@ -145,7 +145,7 @@
 	var/mob/living/victim = pick(victims)
 	to_chat(victim, "<span class='userdanger'>You feel an awful sense of being watched...</span>")
 	victim.Stun(3) //HUE
-	var/area/A = victim.loc.loc
+	var/area/A = get_area(victim)
 	if(!A)
 		to_chat(usr, "<span class='warning'>You could not locate any sapient heretics for the Slaughter.</span>")
 		return 0
@@ -168,7 +168,7 @@
 
 		S.key = C.key
 		S.mind.assigned_role = "Harbringer of the Slaughter"
-		S.mind.special_role = "Harbringer of the Slaugther"
+		S.mind.special_role = "Harbringer of the Slaughter"
 		to_chat(S, playstyle_string)
 		ticker.mode.add_cultist(S.mind)
 		var/obj/effect/proc_holder/spell/targeted/sense_victims/SV = new

code/modules/mob/living/carbon/life.dm

@@ -331,9 +331,6 @@
 	if(confused)
 		AdjustConfused(-1)
 
-	if(cultslurring)
-		cultslurring = max(cultslurring-1, 0)
-
 	//Jitteryness
 	if(jitteriness)
 		do_jitter_animation(jitteriness)

code/modules/mob/living/life.dm

@@ -113,6 +113,7 @@
 	handle_sleeping()
 	handle_slowed()
 	handle_drunk()
+	handle_cultslurring()
 
 
 /mob/living/proc/handle_stunned()
@@ -149,6 +150,11 @@
 		AdjustSlur(-1)
 	return slurring
 
+/mob/living/proc/handle_cultslurring()
+	if(cultslurring)
+		AdjustCultSlur(-1)
+	return cultslurring
+
 /mob/living/proc/handle_paralysed()
 	if(paralysis)
 		AdjustParalysis(-1, updating = 1, force = 1)

code/modules/mob/living/status_procs.dm

@@ -67,6 +67,8 @@
 			Your character moves slower.
 	*	Slurring				*
 			Your character cannot enunciate clearly.
+	*	CultSlurring			*
+			Your character cannot enunciate clearly while mumbling about elder codes.
 	*	Stunned					*
 			Your character is unable to move, and drops stuff in their hands. They keep standing, though.
 	* Stuttering			*
@@ -108,6 +110,7 @@
 
 /mob // On `/mob` for now, to support legacy code
 	var/confused = 0
+	var/cultslurring = 0
 	var/dizziness = 0
 	var/drowsyness = 0
 	var/druggy = 0
@@ -377,6 +380,18 @@
 
 // SLURRING
 
+/mob/living/Slur(amount)
+	SetSlur(max(slurring, amount))
+
+/mob/living/SetSlur(amount)
+	slurring = max(amount, 0)
+
+/mob/living/AdjustSlur(amount, bound_lower = 0, bound_upper = INFINITY)
+	var/new_value = directional_bounded_sum(slurring, amount, bound_lower, bound_upper)
+	SetSlur(new_value)
+
+// CULTSLURRING
+
 /mob/living/Slur(amount)
 	SetSlur(max(slurring, amount))
 

code/modules/mob/mob_defines.dm

@@ -107,7 +107,6 @@
 
 	var/datum/dna/dna = null//Carbon
 	var/radiation = 0 //Carbon
-	var/cultslurring = 0 
 
 	var/list/mutations = list() //Carbon -- Doohl
 	//see: setup.dm for list of mutations

code/modules/mob/status_procs.dm

@@ -171,6 +171,14 @@
 /mob/proc/AdjustSlur()
 	return
 
+/mob/proc/CultSlur()
+	return
+
+/mob/proc/SetCultSlur()
+	return
+
+/mob/proc/AdjustCultSlur()
+	return
 
 /mob/proc/Stun()
 	return

code/modules/reagents/chemistry/reagents/water.dm

@@ -278,6 +278,7 @@
 		M.AdjustStuttering(4, bound_lower = 0, bound_upper = 20)
 		M.Dizzy(5)
 		if(iscultist(M) && prob(5))
+			M.AdjustCultSlur(5)//5 seems like a good number...
 			M.say(pick("Av'te Nar'sie","Pa'lid Mors","INO INO ORA ANA","SAT ANA!","Daim'niodeis Arc'iai Le'eones","Egkau'haom'nai en Chaous","Ho Diak'nos tou Ap'iron","R'ge Na'sie","Diabo us Vo'iscum","Si gn'um Co'nu"))
 	if(current_cycle >= 75 && prob(33))	// 30 units, 150 seconds
 		M.AdjustConfused(3)
@@ -359,6 +360,7 @@
 		M.adjustFireLoss(2)
 		M.adjustOxyLoss(2)
 		M.adjustBruteLoss(2)
+		M.AdjustCultSlur(10)//CUASE WHY THE HELL NOT
 	..()
 
 /datum/reagent/fuel/unholywater/on_mob_delete(mob/living/M)