shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

descriptions, conflict, and actually puts requirements for the gamemode.

Browse Source
This commit is contained in:
kiwedespars
2020-08-10 20:59:51 -07:00
parent c09960c48f
commit 415e2556f9
7 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/eldritch_cult/eldritch_antag.dm
+1 -1
View File
@@ -94,7 +94,7 @@
var/list/assasination = list()
var/list/protection = list()
for(var/i in 1 to 2)
var/pck = pick("assasinate","stalk","protect")
var/pck = pick("assasinate","protect")
switch(pck)
if("assasinate")
var/datum/objective/assassinate/A = new
code/modules/antagonists/eldritch_cult/eldritch_magic.dm
+1 -1
View File
@@ -65,7 +65,7 @@
use_charge = TRUE
var/mob/living/carbon/C = target
C.adjustBruteLoss(15)
C.AdjustKnockdown(5 SECONDS)
C.AdjustKnockdown(1 SECOND)
C.adjustStaminaLoss(40)
var/list/knowledge = cultie.get_all_knowledge()
code/modules/antagonists/eldritch_cult/knowledge/ash_lore.dm
+8 -8
View File
@@ -1,7 +1,7 @@
/datum/eldritch_knowledge/base_ash
name = "Nightwatcher's Secret"
desc = "Opens up the path of ash to you. Allows you to transmute a match with a kitchen knife or it's derivatives into an ashen blade."
gain_text = "City Guard knows their watch. If you ask them at night, they may just tell you about the Ashy Lantern."
desc = "Inducts you into the Path of Ash. Allows you to transmute a match with an eldritch blade into an ashen blade."
gain_text = "The City guard knows their watch. If you ask them at night they may tell you about the ashy lantern."
banned_knowledge = list(/datum/eldritch_knowledge/base_rust,/datum/eldritch_knowledge/base_flesh,/datum/eldritch_knowledge/final/rust_final,/datum/eldritch_knowledge/final/flesh_final)
next_knowledge = list(/datum/eldritch_knowledge/ashen_grasp)
required_atoms = list(/obj/item/melee/sickly_blade,/obj/item/match)
@@ -12,7 +12,7 @@
/datum/eldritch_knowledge/spell/ashen_shift
name = "Ashen Shift"
gain_text = "Ash is all the same, how can one man master it all?"
desc = "Short range jaunt that can help you escape from bad situations."
desc = "A short range jaunt that will enable you to escape from danger."
cost = 1
spell_to_add = /obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift/ash
next_knowledge = list(/datum/eldritch_knowledge/ash_mark,/datum/eldritch_knowledge/essence,/datum/eldritch_knowledge/ashen_eyes)
@@ -20,8 +20,8 @@
/datum/eldritch_knowledge/ashen_grasp
name = "Grasp of Ash"
gain_text = "Gates have opened, minds have flooded, I remain."
desc = "Empowers your mansus grasp to throw away enemies."
gain_text = "Gates have opened, minds have flooded, yet I remain."
desc = "Empowers your mansus grasp to knock enemies down and throw them away."
cost = 1
next_knowledge = list(/datum/eldritch_knowledge/spell/ashen_shift)
route = PATH_ASH
@@ -40,7 +40,7 @@
if(!istype(X,/obj/effect/proc_holder/spell/targeted/touch/mansus_grasp))
continue
var/obj/effect/proc_holder/spell/targeted/touch/mansus_grasp/MG = X
MG.charge_counter = min(round(MG.charge_counter + MG.charge_max * 0.5),MG.charge_max) // refunds 75% of charge.
MG.charge_counter = min(round(MG.charge_counter + MG.charge_max * 0.5),MG.charge_max) // refunds 50% of charge.
var/atom/throw_target = get_edge_target_turf(C, user.dir)
if(!C.anchored)
. = TRUE
@@ -155,7 +155,7 @@
/datum/eldritch_knowledge/spell/cleave
name = "Blood Cleave"
gain_text = "At first I was unfamiliar with these instruments of war, but the priest told me how to use them."
desc = "Gives a ranged spell that causes heavy bleeding and blood loss to a target and any surrounding individuals."
desc = "Grants a spell that will inflict wounds and bleeding upon the target, as well as in a short radius around them."
cost = 1
spell_to_add = /obj/effect/proc_holder/spell/pointed/cleave
next_knowledge = list(/datum/eldritch_knowledge/spell/entropic_plume,/datum/eldritch_knowledge/spell/flame_birth)
@@ -163,7 +163,7 @@
/datum/eldritch_knowledge/final/ash_final
name = "Ashlord's Rite"
gain_text = "The forgotten lords have spoken! The Lord of Ash has come! Fear the flame!"
desc = "Bring 3 corpses onto a transmutation rune, you will become immune to fire ,space ,cold and other enviromental hazards and become overall sturdier to all other damages. You will gain a spell that passively creates ring of fire around you as well ,as you will gain a powerful abiltiy that let's you create a wave of flames all around you."
desc = "Bring three corpses onto a transmutation rune, after ascending you will become immune to fire, space, temperature and other environmental hazards. You will develop resistance to all other damages. You will be granted two spells, one which can bring forth a cascade of massive fire, and another which will surround your body in precious flames for a minute."
required_atoms = list(/mob/living/carbon/human)
cost = 3
route = PATH_ASH
code/modules/antagonists/eldritch_cult/knowledge/flesh_lore.dm
+2 -2
View File
@@ -112,8 +112,8 @@
. = TRUE
RegisterSignal(human_target,COMSIG_MOB_DEATH,.proc/remove_ghoul)
human_target.revive(full_heal = TRUE, admin_revive = TRUE)
human_target.setMaxHealth(25)
human_target.health = 25
human_target.setMaxHealth(40)
human_target.health = 40
human_target.become_husk()
human_target.faction |= "heretics"
var/datum/antagonist/heretic_monster/heretic_monster = human_target.mind.add_antag_datum(/datum/antagonist/heretic_monster)
code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm
+6 -6
View File
@@ -1,6 +1,6 @@
/datum/eldritch_knowledge/base_rust
name = "Blacksmith's Tale"
desc = "Opens up the path of rust to you. Allows you to transmute a knife with any trash item into a Rusty Blade."
desc = "Inducts you into the Path of Rust. Allows you to transmute an eldritch blade with any trash item into a Blade of Rust."
gain_text = "'Let me tell you a story,' The Blacksmith said as he gazed into his rusty blade."
banned_knowledge = list(/datum/eldritch_knowledge/base_ash,/datum/eldritch_knowledge/base_flesh,/datum/eldritch_knowledge/final/ash_final,/datum/eldritch_knowledge/final/flesh_final)
next_knowledge = list(/datum/eldritch_knowledge/rust_fist)
@@ -11,7 +11,7 @@
/datum/eldritch_knowledge/rust_fist
name = "Grasp of Rust"
desc = "Empowers your mansus grasp to deal 500 damage to non-living matter and rust any turf it touches. Destroys already rusted turfs."
desc = "Empowers your Mansus Grasp to deal 500 damage to non-living matter and rust any structure it touches. Destroys already rusted structures."
gain_text = "Rust grows on the ceiling of the mansus."
cost = 1
next_knowledge = list(/datum/eldritch_knowledge/rust_regen)
@@ -61,7 +61,7 @@
/datum/eldritch_knowledge/rust_mark
name = "Mark of Rust"
desc = "Your eldritch blade now applies a rust mark. Rust mark has a chance to deal between 0 to 200 damage to 75% of enemies items. To Detonate the mark use your mansus grasp on it."
desc = "Your eldritch blade now applies a rust mark. Rust marks have a chance to deal between 0 to 200 damage to 75% of enemies items. To activate the mark use your Mansus Grasp on it."
gain_text = "Lords of the depths help those in dire need at a cost."
cost = 2
next_knowledge = list(/datum/eldritch_knowledge/spell/area_conversion)
@@ -100,7 +100,7 @@
/datum/eldritch_knowledge/armor
name = "Armorer's Ritual"
desc = "You can now create eldritch armor using a table and a gas mask."
desc = "You can now create eldritch armor using a built table and a gas mask on top of a transmutation rune."
gain_text = "For I am the heir to the throne of doom."
cost = 1
next_knowledge = list(/datum/eldritch_knowledge/rust_regen,/datum/eldritch_knowledge/flesh_ghoul)
@@ -109,7 +109,7 @@
/datum/eldritch_knowledge/essence
name = "Priest's Ritual"
desc = "You can now transmute a tank of water into a bottle of eldritch water."
desc = "You can now transmute a tank of water into a bottle of eldritch fluid."
gain_text = "This is an old recipe, i got it from an owl."
cost = 1
next_knowledge = list(/datum/eldritch_knowledge/rust_regen,/datum/eldritch_knowledge/spell/ashen_shift)
@@ -118,7 +118,7 @@
/datum/eldritch_knowledge/final/rust_final
name = "Rustbringer's Oath"
desc = "Bring 3 corpses onto the transmutation rune. After you finish the ritual rust will now automatically spread from the rune. Your healing on rust is also tripled, while you become more resillient overall."
desc = "Bring three corpses onto a transmutation rune. After you finish the ritual, rust will now automatically spread from the rune. Your healing on rust is also tripled, while you become more resilient overall."
gain_text = "Champion of rust. Corruptor of steel. Fear the dark for Rustbringer has come!"
cost = 3
required_atoms = list(/mob/living/carbon/human)