From 7771e467671534e366ea43574b36562c66c606db Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sun, 22 May 2022 02:09:53 +0200 Subject: [PATCH] [MIRROR] Fixes accidental nerfs to rust and blade heretic ascension [MDB IGNORE] (#13793) * Fixes accidental nerfs to rust and blade heretic ascension (#67170) fixes heretic ascensions losing stun immunity * Fixes accidental nerfs to rust and blade heretic ascension Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> --- code/modules/antagonists/heretic/knowledge/blade_lore.dm | 2 +- code/modules/antagonists/heretic/knowledge/rust_lore.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/antagonists/heretic/knowledge/blade_lore.dm b/code/modules/antagonists/heretic/knowledge/blade_lore.dm index 35326d265a9..6487d98e8af 100644 --- a/code/modules/antagonists/heretic/knowledge/blade_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/blade_lore.dm @@ -369,7 +369,7 @@ . = ..() priority_announce("[generate_heretic_text()] Master of blades, the Colonel's disciple, [user.real_name] has ascended! Their steel is that which will cut reality in a maelstom of silver! [generate_heretic_text()]","[generate_heretic_text()]", ANNOUNCER_SPANOMALIES) user.client?.give_award(/datum/award/achievement/misc/blade_ascension, user) - ADD_TRAIT(user, TRAIT_BATON_RESISTANCE, name) + ADD_TRAIT(user, TRAIT_STUNIMMUNE, name) ADD_TRAIT(user, TRAIT_NEVER_WOUNDED, name) RegisterSignal(user, COMSIG_HERETIC_BLADE_ATTACK, .proc/on_eldritch_blade) user.apply_status_effect(/datum/status_effect/protective_blades/recharging, null, 8, 30, 0.25 SECONDS, 1 MINUTES) diff --git a/code/modules/antagonists/heretic/knowledge/rust_lore.dm b/code/modules/antagonists/heretic/knowledge/rust_lore.dm index a51988283ad..5d6b3d0e48a 100644 --- a/code/modules/antagonists/heretic/knowledge/rust_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/rust_lore.dm @@ -201,7 +201,7 @@ var/area/ritual_location = /area/station/command/bridge /// A static list of traits we give to the heretic when on rust. var/static/list/conditional_immunities = list( - TRAIT_BATON_RESISTANCE, + TRAIT_STUNIMMUNE, TRAIT_SLEEPIMMUNE, TRAIT_PUSHIMMUNE, TRAIT_SHOCKIMMUNE,