diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index e9e053cdb15..1f3cd9dec62 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -1,6 +1,7 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 /datum/game_mode + var/datum/cult_info/cult = pick(subtypesof(/datum/cult)) var/list/datum/mind/cult = list() var/list/allwords = list("travel","self","see","hell","blood","join","tech","destroy", "other", "hide") @@ -115,7 +116,7 @@ else explanation = "Free objective." if("eldergod") - 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." + explanation = "Summon [cult.entity_name] via the use of the appropriate rune (Hell join self). It will only work if nine cultists stand on and around it." to_chat(cult_mind.current, "Objective #[obj_count]: [explanation]") cult_mind.memory += "Objective #[obj_count]: [explanation]
" to_chat(cult_mind.current, "The convert rune is join blood self") @@ -289,10 +290,10 @@ feedback_add_details("cult_objective","cult_sacrifice|FAIL|GIBBED") if("eldergod") if(!eldergod) - explanation = "Summon Nar-Sie. Success!" + explanation = "Summon [cult.entity_name]. Success!" feedback_add_details("cult_objective","cult_narsie|SUCCESS") else - explanation = "Summon Nar-Sie. Fail." + explanation = "Summon [cult.entity_name]. Fail." feedback_add_details("cult_objective","cult_narsie|FAIL") text += "
Objective #[obj_count]: [explanation]" diff --git a/code/game/gamemodes/cult/cult_datums.dm b/code/game/gamemodes/cult/cult_datums.dm new file mode 100644 index 00000000000..bb9b26ef1f5 --- /dev/null +++ b/code/game/gamemodes/cult/cult_datums.dm @@ -0,0 +1,87 @@ +//cult datums by FalseIncarnate +/datum/cult_info + var/name = "Cult of Nar'Sie" + var/theme = "blood" + + //God Entity + var/entity_name = "Nar'Sie" + var/entity_title1 = "The Dark One" + var/entity_title2 = "The One Who Sees" + var/entity_title3 = "The Geometer of Blood" + var/entity_icon_state = "" + + //Builder Construct + var/artificer_name = "Artificer" + var/artificer_icon_state = "artificer" + var/artificer_dead_state = "shade_dead" + + //Behemoth Construct + var/behemoth_name = "Behemoth" + var/behemoth_icon_state = "behemoth" + var/behemoth_dead_state = "shade_dead" + + //Wraith Construct + var/wraith_name = "Wraith" + var/wraith_icon_state = "floating" + var/wraith_dead_state = "shade_dead" + + //Armored Construct + var/juggernaut_name = "Juggernaut" + var/juggernaut_icon_state = "armour" + var/juggernaut_dead_state = "shade_dead" + + //Harvester Construct + var/harvester_name = "Harvester" + var/harvester_icon_state = "harvester" + var/harvester_dead_state = "shade_dead" + + //Shade Spirit + var/shade_name = "Shade" + var/shade_icon_state = "shade" + var/shade_dead_state = "shade_dead" + + //Turfs + var/cult_floor_icon_state = "cult" + var/cult_wall_icon_state = "cult" + +/datum/cult_info/fire + name = "Cult of Pyr'Kaeus" + theme = "fire" + + entity_name = "Pyr'Kaeus" + entity_title1 = "The Burning One" + entity_title2 = "The One Who Consumes" + entity_title3 = "The Harbinger of Fire" + + artificer_name = "Igniting Ember" + + behemoth_name = "Devouring Hatred" + + wraith_name = "Living Flame" + + juggernaut_name = "Pyre Armor" + + harvester_name = "Coal Seeker" + + shade_name = "Charred Soul" + +/datum/cult_info/death + name = "Cult of Mortality" + theme = "death" + + entity_name = "The Reaper + entity_title1 = "The Silent One" + entity_title2 = "The One Who Beckons" + entity_title3 = "The Ferryman of Oblivion" + + artificer_name = "Boneshaper" + + behemoth_name = "Draugr" + + wraith_name = "Wraith" + + juggernaut_name = "Wight" + + harvester_name = "Psychopomp" + + shade_name = "Banshee" \ No newline at end of file diff --git a/paradise.dme b/paradise.dme index 00a734329dc..8d435854e44 100644 --- a/paradise.dme +++ b/paradise.dme @@ -393,6 +393,7 @@ #include "code\game\gamemodes\changeling\powers\tiny_prick.dm" #include "code\game\gamemodes\changeling\powers\transform.dm" #include "code\game\gamemodes\cult\cult.dm" +#include "code\game\gamemodes\cult\cult_datums.dm" #include "code\game\gamemodes\cult\cult_items.dm" #include "code\game\gamemodes\cult\cult_structures.dm" #include "code\game\gamemodes\cult\ritual.dm" @@ -1636,7 +1637,6 @@ #include "code\modules\mob\new_player\preferences_setup.dm" #include "code\modules\mob\new_player\sprite_accessories.dm" #include "code\modules\mob\spirit\movement.dm" -#include "code\modules\mob\spirit\spirit.dm" #include "code\modules\nano\nanoexternal.dm" #include "code\modules\nano\nanomanager.dm" #include "code\modules\nano\nanomapgen.dm"