From 447a80c743c072d7d1e13a39ccd7b24ad2e49760 Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Sat, 17 Sep 2016 09:06:12 -0400 Subject: [PATCH 1/3] Some cult fixes --- code/game/gamemodes/cult/runes.dm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 6e3ceba0756..dc0d006f4b3 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -337,6 +337,9 @@ var/list/teleport_runes = list() allow_excess_invokers = 1 rune_in_use = FALSE +/obj/effect/rune/convert/do_invoke_glow() + return + /obj/effect/rune/convert/invoke(var/list/invokers) if(rune_in_use) return @@ -366,7 +369,7 @@ var/list/teleport_runes = list() do_convert(L, invokers) else do_sacrifice(L, invokers) - color = initial(color) + animate(src, color = initial(color), time = 5) rune_in_use = FALSE /obj/effect/rune/convert/proc/do_convert(mob/living/convertee, list/invokers) @@ -383,8 +386,8 @@ var/list/teleport_runes = list() var/brutedamage = convertee.getBruteLoss() var/burndamage = convertee.getFireLoss() if(brutedamage || burndamage) - convertee.adjustBruteLoss(-brutedamage) - convertee.adjustFireLoss(-burndamage) + convertee.adjustBruteLoss(-(brutedamage * 0.75)) + convertee.adjustFireLoss(-(burndamage * 0.75)) convertee.visible_message("[convertee] writhes in pain \ [brutedamage || burndamage ? "even as their wounds heal and close" : "as the markings below them glow a bloody red"]!", \ "AAAAAAAAAAAAAA-") @@ -478,6 +481,7 @@ var/list/teleport_runes = list() M << "Nar-Sie does not respond!" fail_invoke() log_game("Summon Nar-Sie rune failed - gametype is not cult") + return if(locate(/obj/singularity/narsie) in poi_list) for(var/M in invokers) @@ -681,7 +685,7 @@ var/list/teleport_runes = list() var/turf/T = get_turf(src) rune_in_use = 1 affecting = user - user.color = "#7e1717" + user.color = "#7D1717" user.visible_message("[user] freezes statue-still, glowing an unearthly red.", \ "You see what lies beyond. All is revealed. While this is a wondrous experience, your physical form will waste away in this state. Hurry...") user.ghostize(1) From f50bb7fb4b577e52974e4ad5ca80368040bd52de Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Sat, 17 Sep 2016 09:09:21 -0400 Subject: [PATCH 2/3] BARHAH HRA ZARGARIS --- code/game/gamemodes/cult/runes.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index dc0d006f4b3..b14f3d286aa 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -355,11 +355,11 @@ var/list/teleport_runes = list() rune_in_use = TRUE visible_message("[src] pulses blood red!") color = "#7D1717" - ..() var/mob/living/L = pick(myriad_targets) var/is_clock = is_servant_of_ratvar(L) var/is_convertable = is_convertable_to_cult(L.mind) if(L.stat != DEAD && (is_clock || is_convertable)) + invocation = "Mah'weyh pleggh at e'ntrath!" if(is_clock) L.visible_message("[L]'s eyes glow a defiant yellow!", \ "\"Stop resisting. You will be mi-\"\n\ @@ -368,7 +368,9 @@ var/list/teleport_runes = list() else if(is_convertable) do_convert(L, invokers) else + invocation = "Barhah hra zar'garis!" do_sacrifice(L, invokers) + ..() animate(src, color = initial(color), time = 5) rune_in_use = FALSE From ca285a00c07b9b4b2b8c8967b247b2a9f7460025 Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Sat, 17 Sep 2016 12:21:54 -0400 Subject: [PATCH 3/3] I can't actually get away with one --- code/game/gamemodes/cult/runes.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index b14f3d286aa..d6340bab28c 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -360,6 +360,7 @@ var/list/teleport_runes = list() var/is_convertable = is_convertable_to_cult(L.mind) if(L.stat != DEAD && (is_clock || is_convertable)) invocation = "Mah'weyh pleggh at e'ntrath!" + ..() if(is_clock) L.visible_message("[L]'s eyes glow a defiant yellow!", \ "\"Stop resisting. You will be mi-\"\n\ @@ -369,8 +370,8 @@ var/list/teleport_runes = list() do_convert(L, invokers) else invocation = "Barhah hra zar'garis!" + ..() do_sacrifice(L, invokers) - ..() animate(src, color = initial(color), time = 5) rune_in_use = FALSE