From fb924f1f8ddeeecbbd71a385de49cfef32c56db5 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 28 Apr 2017 21:01:48 -0500 Subject: [PATCH] Blood Cult removals and tweaks --- code/game/gamemodes/cult/runes.dm | 57 +++++---------------------- code/game/gamemodes/cult/runes.dm.rej | 10 +++++ code/game/gamemodes/cult/talisman.dm | 22 ++--------- 3 files changed, 22 insertions(+), 67 deletions(-) create mode 100644 code/game/gamemodes/cult/runes.dm.rej diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 296b248938..3a80ed54b3 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -211,7 +211,7 @@ structure_check() searches for nearby cultist structures required for the invoca log_game("Talisman Creation rune failed - already in use") return - for(var/I in subtypesof(/obj/item/weapon/paper/talisman) - /obj/item/weapon/paper/talisman/malformed - /obj/item/weapon/paper/talisman/supply - /obj/item/weapon/paper/talisman/supply/weak) + for(var/I in subtypesof(/obj/item/weapon/paper/talisman) - /obj/item/weapon/paper/talisman/malformed - /obj/item/weapon/paper/talisman/supply - /obj/item/weapon/paper/talisman/supply/weak - /obj/item/weapon/paper/talisman/summon_tome) var/obj/item/weapon/paper/talisman/J = I var/talisman_cult_name = initial(J.cultist_name) if(talisman_cult_name) @@ -633,9 +633,9 @@ structure_check() searches for nearby cultist structures required for the invoca qdel(src) //delete before pulsing because it's a delay reee empulse(E, 9*invokers.len, 12*invokers.len) // Scales now, from a single room to most of the station depending on # of chanters -//Rite of Astral Communion: Separates one's spirit from their body. They will take damage while it is active. -/obj/effect/rune/astral - cultist_name = "Astral Communion" +//Rite of Spirit Sight: Separates one's spirit from their body. They will take damage while it is active. +/obj/effect/rune/spirit + cultist_name = "Spirit Sight" cultist_desc = "severs the link between one's spirit and body. This effect is taxing and one's physical body will take damage while this is active." invocation = "Fwe'sh mah erl nyag r'ya!" icon_state = "7" @@ -644,24 +644,24 @@ structure_check() searches for nearby cultist structures required for the invoca construct_invoke = 0 var/mob/living/affecting = null -/obj/effect/rune/astral/examine(mob/user) +/obj/effect/rune/spirit/examine(mob/user) ..() if(affecting) to_chat(user, "A translucent field encases [user] above the rune!") -/obj/effect/rune/astral/can_invoke(mob/living/user) +/obj/effect/rune/spirit/can_invoke(mob/living/user) if(rune_in_use) to_chat(user, "[src] cannot support more than one body!") - log_game("Astral Communion rune failed - more than one user") + log_game("Spirit Sight rune failed - more than one user") return list() var/turf/T = get_turf(src) if(!(user in T)) to_chat(user, "You must be standing on top of [src]!") - log_game("Astral Communion rune failed - user not standing on rune") + log_game("Spirit Sight rune failed - user not standing on rune") return list() return ..() -/obj/effect/rune/astral/invoke(var/list/invokers) +/obj/effect/rune/spirit/invoke(var/list/invokers) var/mob/living/user = invokers[1] ..() var/turf/T = get_turf(src) @@ -898,45 +898,6 @@ structure_check() searches for nearby cultist structures required for the invoca if(is_servant_of_ratvar(L)) L.adjustStaminaLoss(tick_damage*0.5) - -//Deals brute damage to all targets on the rune and heals the invoker for each target drained. -/obj/effect/rune/leeching - cultist_name = "Drain Life" - cultist_desc = "drains the life of all targets on the rune, restoring life to the user." - invocation = "Yu'gular faras desdae. Umathar uf'kal thenar!" - icon_state = "3" - color = "#9F1C34" - -/obj/effect/rune/leeching/can_invoke(mob/living/user) - if(world.time <= user.next_move) - return list() - var/turf/T = get_turf(src) - var/list/potential_targets = list() - for(var/mob/living/carbon/M in T.contents - user) - if(M.stat != DEAD) - potential_targets += M - if(!potential_targets.len) - to_chat(user, "There must be at least one valid target on the rune!") - log_game("Leeching rune failed - no valid targets") - return list() - return ..() - -/obj/effect/rune/leeching/invoke(var/list/invokers) - var/mob/living/user = invokers[1] - user.changeNext_move(CLICK_CD_CLICK_ABILITY) - ..() - var/turf/T = get_turf(src) - for(var/mob/living/carbon/M in T.contents - user) - if(M.stat != DEAD) - var/drained_amount = rand(10,20) - M.apply_damage(drained_amount, BRUTE, "chest") - user.adjustBruteLoss(-drained_amount) - to_chat(M, "You feel extremely weak.") - user.Beam(T,icon_state="drainbeam",time=5) - user.visible_message("Blood flows from the rune into [user]!", \ - "Blood flows into you, healing your wounds and revitalizing your spirit.") - - //Rite of Spectral Manifestation: Summons a ghost on top of the rune as a cultist human with no items. User must stand on the rune at all times, and takes damage for each summoned ghost. /obj/effect/rune/manifest cultist_name = "Manifest Spirit" diff --git a/code/game/gamemodes/cult/runes.dm.rej b/code/game/gamemodes/cult/runes.dm.rej new file mode 100644 index 0000000000..696dbe5ddd --- /dev/null +++ b/code/game/gamemodes/cult/runes.dm.rej @@ -0,0 +1,10 @@ +diff a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm (rejected hunks) +@@ -520,7 +520,7 @@ var/list/teleport_runes = list() + + //Rite of Resurrection: Requires the corpse of a cultist and that there have been less revives than the number of people sacrificed + /obj/effect/rune/raise_dead +- cultist_name = "Raise Dead" ++ cultist_name = "Resurrect Cultist" + cultist_desc = "requires the corpse of a cultist placed upon the rune. Provided there have been sufficient sacrifices, they will be revived." + invocation = null //Depends on the name of the user - see below + icon_state = "1" diff --git a/code/game/gamemodes/cult/talisman.dm b/code/game/gamemodes/cult/talisman.dm index 2876e80373..2411f0c40d 100644 --- a/code/game/gamemodes/cult/talisman.dm +++ b/code/game/gamemodes/cult/talisman.dm @@ -176,7 +176,7 @@ invocation = "Kla'atu barada nikt'o!" health_cost = 1 creation_time = 30 - uses = 2 + uses = 6 var/revealing = FALSE //if it reveals or not /obj/item/weapon/paper/talisman/true_sight/invoke(mob/living/user, successfuluse = 1) @@ -186,7 +186,7 @@ "You speak the words of the talisman, hiding nearby runes.") invocation = "Nikt'o barada kla'atu!" revealing = TRUE - for(var/obj/effect/rune/R in range(3,user)) + for(var/obj/effect/rune/R in range(4,user)) R.talismanhide() else user.visible_message("A flash of light shines from [user]'s hand!", \ @@ -194,22 +194,6 @@ for(var/obj/effect/rune/R in range(3,user)) R.talismanreveal() -//Rite of False Truths: Same as rune -/obj/item/weapon/paper/talisman/make_runes_fake - cultist_name = "Talisman of Disguising" - cultist_desc = "A talisman that will make nearby runes appear fake." - color = "#ff80d5" // honk - invocation = "By'o nar'nar!" - creation_time = 20 - -/obj/item/weapon/paper/talisman/make_runes_fake/invoke(mob/living/user, successfuluse = 1) - . = ..() - user.visible_message("Dust flows from [user]s hand.", \ - "You speak the words of the talisman, making nearby runes appear fake.") - for(var/obj/effect/rune/R in orange(6,user)) - R.desc = "A rune vandalizing the station." - - //Rite of Disruption: Weaker than rune /obj/item/weapon/paper/talisman/emp cultist_name = "Talisman of Electromagnetic Pulse" @@ -379,7 +363,7 @@ cultist_desc = "Use this talisman on a victim to handcuff them with dark bindings." invocation = "In'totum Lig'abis!" color = "#B27300" // burnt-orange - uses = 4 + uses = 6 /obj/item/weapon/paper/talisman/shackle/invoke(mob/living/user, successfuluse = 0) if(successfuluse) //if we're forced to be successful(we normally aren't) then do the normal stuff