From aa46e355da555ce24261c65d248114d7ee3b69db Mon Sep 17 00:00:00 2001 From: kiwedespars <47008095+kiwedespars@users.noreply.github.com> Date: Fri, 14 Aug 2020 05:19:57 -0700 Subject: [PATCH] more more more. - sacrifices give 2 charges now. - books no longer contain a charge by default. (sorry gamerko, no easy ascensions while i sleep.) - books are easier to craft. --- .../components/crafting/recipes/recipes_misc.dm | 13 +++++++++++++ .../antagonists/eldritch_cult/eldritch_antag.dm | 6 ++++++ .../antagonists/eldritch_cult/eldritch_book.dm | 2 +- .../antagonists/eldritch_cult/eldritch_knowledge.dm | 1 + 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/code/datums/components/crafting/recipes/recipes_misc.dm b/code/datums/components/crafting/recipes/recipes_misc.dm index 214c1b1427..1d5100122b 100644 --- a/code/datums/components/crafting/recipes/recipes_misc.dm +++ b/code/datums/components/crafting/recipes/recipes_misc.dm @@ -269,6 +269,19 @@ subcategory = CAT_TOOL category = CAT_MISC +/datum/crafting_recipe/heretic/codex + name = "Codex Cicatrix" + result = /obj/item/forbidden_book + tools = list(/obj/item/pen) + reqs = list(/obj/item/book = 1, + /obj/item/organ/eyes = 1, + /obj/item/organ/heart = 1, + /obj/item/stack/sheet/leather = 2) + time = 150 + subcategory = CAT_MISCELLANEOUS + category = CAT_MISC + always_availible = FALSE + //////////// //Vehicles// //////////// diff --git a/code/modules/antagonists/eldritch_cult/eldritch_antag.dm b/code/modules/antagonists/eldritch_cult/eldritch_antag.dm index ca6230db14..367710b110 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_antag.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_antag.dm @@ -40,6 +40,7 @@ START_PROCESSING(SSprocessing,src) if(give_equipment) equip_cultist() + owner.teach_crafting_recipe(/datum/crafting_recipe/heretic/codex) return ..() /datum/antagonist/heretic/on_removal() @@ -109,12 +110,17 @@ P.find_target(owners,assasination) protection += P.target objectives += P + var/datum/objective/sacrifice_ecult/SE = new SE.owner = owner SE.update_explanation_text() objectives += SE + var/datum/objective/escape/escape_objective = new + escape_objective.owner = owner + objectives += escape_objective + /datum/antagonist/heretic/apply_innate_effects(mob/living/mob_override) . = ..() var/mob/living/current = owner.current diff --git a/code/modules/antagonists/eldritch_cult/eldritch_book.dm b/code/modules/antagonists/eldritch_cult/eldritch_book.dm index 5581f37dde..839150d37d 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_book.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_book.dm @@ -8,7 +8,7 @@ ///Last person that touched this var/mob/living/last_user ///how many charges do we have? - var/charge = 1 + var/charge = 0 ///Where we cannot create the rune? var/static/list/blacklisted_turfs = typecacheof(list(/turf/closed,/turf/open/space,/turf/open/lava)) diff --git a/code/modules/antagonists/eldritch_cult/eldritch_knowledge.dm b/code/modules/antagonists/eldritch_cult/eldritch_knowledge.dm index ede9ac31f3..065844bedf 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_knowledge.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_knowledge.dm @@ -257,6 +257,7 @@ continue var/obj/item/forbidden_book/FB = X FB.charge++ + FB.charge++ break if(!LH.target)