diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index 733c3e4e93f..936eea26d1c 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -533,7 +533,7 @@ datum/mind
special_role = null
var/datum/game_mode/cult/cult = ticker.mode
if (istype(cult))
- cult.memoize_cult_objectives(src)
+ cult.memorize_cult_objectives(src)
current << "\red The nanobots in the loyalty implant remove all thoughts about being in a cult. Have a productive day!"
memory = ""
if(src in ticker.mode.traitors)
@@ -543,7 +543,7 @@ datum/mind
log_admin("[key_name_admin(usr)] has de-traitor'ed [current].")
else if (href_list["revolution"])
- current.hud_updateflag |= (1 << SPECIALROLE_HUD)
+ current.hud_updateflag |= (1 << SPECIALROLE_HUD)
switch(href_list["revolution"])
if("clear")
@@ -648,7 +648,7 @@ datum/mind
var/datum/game_mode/cult/cult = ticker.mode
if (istype(cult))
if(!config.objectives_disabled)
- cult.memoize_cult_objectives(src)
+ cult.memorize_cult_objectives(src)
current << "\red You have been brainwashed! You are no longer a cultist!"
memory = ""
log_admin("[key_name_admin(usr)] has de-cult'ed [current].")
@@ -663,7 +663,7 @@ datum/mind
var/datum/game_mode/cult/cult = ticker.mode
if (istype(cult))
if(!config.objectives_disabled)
- cult.memoize_cult_objectives(src)
+ cult.memorize_cult_objectives(src)
log_admin("[key_name_admin(usr)] has cult'ed [current].")
if("tome")
var/mob/living/carbon/human/H = current
@@ -1126,7 +1126,7 @@ datum/mind
current << "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."
var/datum/game_mode/cult/cult = ticker.mode
if (istype(cult))
- cult.memoize_cult_objectives(src)
+ cult.memorize_cult_objectives(src)
else
var/explanation = "Summon Nar-Sie via the use of the appropriate rune (Hell join self). It will only work if nine cultists stand on and around it."
current << "Objective #1: [explanation]"
diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm
index d2e2ddbdf76..285a2ac0e3a 100644
--- a/code/game/gamemodes/cult/cult.dm
+++ b/code/game/gamemodes/cult/cult.dm
@@ -99,7 +99,7 @@
update_cult_icons_added(cult_mind)
cult_mind.current << "\blue You are a member of the cult!"
if(!config.objectives_disabled)
- memoize_cult_objectives(cult_mind)
+ memorize_cult_objectives(cult_mind)
else
cult_mind.current << "Within the rules, try to act as an opposing force to the crew. Further RP and try to make sure other players have fun! If you are confused or at a loss, always adminhelp, and before taking extreme actions, please try to also contact the administration! Think through your actions and make the roleplay immersive! Please remember all rules aside from those without explicit exceptions apply to antagonists."
cult_mind.special_role = "Cultist"
@@ -109,7 +109,7 @@
..()
-/datum/game_mode/cult/proc/memoize_cult_objectives(var/datum/mind/cult_mind)
+/datum/game_mode/cult/proc/memorize_cult_objectives(var/datum/mind/cult_mind)
for(var/obj_count = 1,obj_count <= objectives.len,obj_count++)
var/explanation
switch(objectives[obj_count])
@@ -186,7 +186,7 @@
if (!..(cult_mind))
return
if (!config.objectives_disabled)
- memoize_cult_objectives(cult_mind)
+ memorize_cult_objectives(cult_mind)
/datum/game_mode/proc/remove_cultist(datum/mind/cult_mind, show_message = 1)
diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm
index a9217cd00f1..8d426c5e13c 100644
--- a/code/game/gamemodes/cult/runes.dm
+++ b/code/game/gamemodes/cult/runes.dm
@@ -108,16 +108,33 @@ var/list/sacrificed = list()
"\red AAAAAAHHHH!.", \
"\red You hear an anguished scream.")
if(is_convertable_to_cult(M.mind) && !jobban_isbanned(M, "cultist"))//putting jobban check here because is_convertable uses mind as argument
- ticker.mode.add_cultist(M.mind)
- M.mind.special_role = "Cultist"
- M << "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root."
- M << "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."
- return 1
+
+ // Mostly for the benefit of those who resist, but it makes sense for even those who join to have some.. effect.
+ M.take_overall_damage(0, 10)
+
+ var/choice = alert(M,"Do you want to join the cult?","Submit to Nar'Sie","Submit","Resist")
+ if(choice == "Submit")
+ ticker.mode.add_cultist(M.mind)
+ M.mind.special_role = "Cultist"
+ M << "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root."
+ M << "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."
+ return 1
+
+ else if(choice == "Resist")
+
+ M.take_overall_damage(0, rand(5, 10)) // You dirty resister cannot handle the damage to your mind. Easily.
+ // Resist messages go!
+ var/BurnLoss = M.getFireLoss()
+ if (BurnLoss < 25) M << "Your blood boils as you force yourself to resist the corruption invading every corner of your mind."
+ else if (BurnLoss < 45) M << "Your blood boils and your body burns as the corruption further forces itself into your body and mind."
+ else if (BurnLoss < 75) M << "You begin to hallucinate images of a dark and incomprehensible being and your entire body feels like its engulfed in flame as your mental defenses crumble."
+ else if (BurnLoss < 100) M << "Your mind turns to ash as the burning flames engulf your very soul and images of Nar'Sie begin to bombard the last remnants of mental resistance."
+ else M << "Your entire broken soul and being is engulfed in corruption and flames as your mind shatters away into nothing."
+ return 0
else
M << "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root."
M << "And you were able to force it out of your mind. You now know the truth, there's something horrible out there, stop it and its minions at all costs."
return 0
-
return fizzle()