From b1d358ed793ea984e909c88255eab990d4366866 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sat, 20 Apr 2019 19:26:53 -0700 Subject: [PATCH 1/3] Update eutactic_blades.dm --- .../code/game/objects/items/melee/eutactic_blades.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modular_citadel/code/game/objects/items/melee/eutactic_blades.dm b/modular_citadel/code/game/objects/items/melee/eutactic_blades.dm index bdd193c477..2bdc475585 100644 --- a/modular_citadel/code/game/objects/items/melee/eutactic_blades.dm +++ b/modular_citadel/code/game/objects/items/melee/eutactic_blades.dm @@ -117,6 +117,11 @@ desc = "The Non-Eutactic Blade utilizes a hardlight blade that is dynamically 'forged' on demand to create a deadly sharp edge that is unbreakable. This one seems to have a damaged handle and misaligned components, causing the blade to be unstable at best" force_on = 15 //As strong a survival knife/bone dagger +/obj/item/melee/transforming/energy/sword/cx/chaplain + name = "divine lightblade" + force_on = 20 //haha i'll regret this + block_chance = 50 + //OBLIGATORY TOY MEMES ///////////////////////////////////// /obj/item/toy/sword/cx From b5df78419a960cd5b54a59faf26b72e37e40d7ff Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sat, 20 Apr 2019 19:28:58 -0700 Subject: [PATCH 2/3] Update holy_weapons.dm --- code/game/objects/items/holy_weapons.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm index 0b61bba471..3fda98e074 100644 --- a/code/game/objects/items/holy_weapons.dm +++ b/code/game/objects/items/holy_weapons.dm @@ -248,7 +248,9 @@ if(SSreligion.holy_weapon_type) return var/obj/item/nullrod/holy_weapon - var/list/holy_weapons_list = typesof(/obj/item/nullrod) + var/list/holy_weapons_list = typesof(/obj/item/nullrod) + list( + /obj/item/melee/transforming/energy/sword/cx/chaplain + ) var/list/display_names = list() for(var/V in holy_weapons_list) var/obj/item/nullrod/rodtype = V From 4190a006934c4b3071c4f77b21b4bd8e87aaa2a1 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sat, 20 Apr 2019 19:37:54 -0700 Subject: [PATCH 3/3] Update eutactic_blades.dm --- .../code/game/objects/items/melee/eutactic_blades.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modular_citadel/code/game/objects/items/melee/eutactic_blades.dm b/modular_citadel/code/game/objects/items/melee/eutactic_blades.dm index 2bdc475585..ce551280d9 100644 --- a/modular_citadel/code/game/objects/items/melee/eutactic_blades.dm +++ b/modular_citadel/code/game/objects/items/melee/eutactic_blades.dm @@ -122,6 +122,10 @@ force_on = 20 //haha i'll regret this block_chance = 50 +/obj/item/melee/transforming/energy/sword/cx/chaplain/Initialize() + . = ..() + AddComponent(/datum/component/anti_magic, TRUE, TRUE) + //OBLIGATORY TOY MEMES ///////////////////////////////////// /obj/item/toy/sword/cx