Skip to content

IN HER NAME! Ira's necro project (WIP) #450

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Dhaeleena wants to merge 3 commits into
base: main
Choose a base branch
from
Open

IN HER NAME! Ira's necro project (WIP) #450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a2e1e2
IN HER NAME! Ira's necro project
Dhaeleena May 22, 2026
f124d40
Merge branch 'CausticCove:main' into Dhaelcodes
Dhaeleena May 22, 2026
0db23f0
Bonechill kinda like minor miracle
Dhaeleena May 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions code/game/objects/items/rogueitems/necro_relics.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,17 @@
target.crystal = WEAKREF(src)
target.key = C.key
current_charges--
SSjob.EquipRank(target, "Greater Skeleton", TRUE)
//Caustic Edit
SSjob.EquipRank(target, "Fortified Skeleton", TRUE)
//Caustic Edit end
target.visible_message(span_warning("[target]'s eyes light up with an eerie glow!"))
var/datum/weakref/W = WEAKREF(target)
active_skeletons += W

target.mind.AddSpell(new /obj/effect/proc_holder/spell/self/suicidebomb/lesser)
addtimer(CALLBACK(target, TYPE_PROC_REF(/mob/living/carbon/human, choose_name_popup), "GREATER SKELETON"), 3 SECONDS)
//Caustic Edit
addtimer(CALLBACK(target, TYPE_PROC_REF(/mob/living/carbon/human, choose_name_popup), "FORTIFIED SKELETON"), 3 SECONDS)
//Caustic Edit end
addtimer(CALLBACK(target, TYPE_PROC_REF(/mob/living/carbon/human, choose_pronouns_and_body)), 7 SECONDS)

if(current_charges <= 0)
Expand Down
1 change: 1 addition & 0 deletions code/modules/jobs/job_types/roguetown/adventurer/types/wretch/necromancer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
H.set_patron(/datum/patron/inhumen/zizo)
H.mind.AddSpell(new /obj/effect/proc_holder/spell/invoked/eyebite)
H.mind.AddSpell(new /obj/effect/proc_holder/spell/invoked/bonechill)
H.mind.AddSpell(new /obj/effect/proc_holder/spell/invoked/diagnose/secular)
H.mind.AddSpell(new /obj/effect/proc_holder/spell/invoked/minion_order)
H.mind.AddSpell(new /obj/effect/proc_holder/spell/invoked/gravemark)
H.mind.AddSpell(new /obj/effect/proc_holder/spell/invoked/raise_undead_formation/necromancer)
Expand Down
43 changes: 36 additions & 7 deletions code/modules/jobs/job_types/roguetown/other/lich_skeleton.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ LICH SKELETONS
if("Flail")
beltr = /obj/item/rogueweapon/flail/sflail/paflail
H.adjust_skillrank(/datum/skill/combat/whipsflails, 1, TRUE)
var/tabards = list("Black Jupon", "Black Tabard", "Black Cloak + Greathood")
var/tabards = list("Black Jupon", "Black Tabard", "Black Cloak + Greathood", "Zizite Tabard") //Caustic Edit
var/tabard_choice = input(H, "Choose your CLOAK.", "BARE YOUR MASTER'S HERALDRY.") as anything in tabards
switch(tabard_choice)
if("Black Jupon")
Expand All @@ -94,6 +94,10 @@ LICH SKELETONS
if("Black Cloak + Greathood")
cloak = /obj/item/clothing/cloak/half/lich
mask = /obj/item/clothing/cloak/tabard/stabard/guardhood/lich
//Caustic Edit
if("Zizite Tabard")
cloak = /obj/item/clothing/cloak/tabard/zizo
//Caustic Edit end

H.energy = H.max_energy

Expand Down Expand Up @@ -175,7 +179,7 @@ LICH SKELETONS
l_hand = /obj/item/gun/ballistic/revolver/grenadelauncher/sling
beltl = /obj/item/quiver/sling/paalloy
H.adjust_skillrank(/datum/skill/combat/slings, 1, TRUE)
var/tabards = list("Black Cloak + Greathood", "Black Jupon", "Black Tabard")
var/tabards = list("Black Cloak + Greathood", "Black Jupon", "Black Tabard", "Zizite Tabard") //Caustic Edit
var/tabard_choice = input(H, "Choose your CLOAK.", "BARE YOUR MASTER'S HERALDRY.") as anything in tabards
switch(tabard_choice)
if("Black Jupon")
Expand All @@ -185,6 +189,10 @@ LICH SKELETONS
if("Black Cloak + Greathood")
cloak = /obj/item/clothing/cloak/half/lich
mask = /obj/item/clothing/cloak/tabard/stabard/guardhood/lich
//Caustic Edit
if("Zizite Tabard")
cloak = /obj/item/clothing/cloak/tabard/zizo
//Caustic Edit end

H.energy = H.max_energy

Expand Down Expand Up @@ -266,7 +274,7 @@ LICH SKELETONS
head = /obj/item/clothing/head/roguetown/helmet/heavy/knight/paalloy
shirt = /obj/item/clothing/suit/roguetown/armor/gambeson/light
armor = /obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/paalloy/heavy
var/tabards = list("Black Tabard", "Black Jupon", "Black Cloak + Greathood")
var/tabards = list("Black Tabard", "Black Jupon", "Black Cloak + Greathood", "Zizite Tabard") //Caustic Edit
var/tabard_choice = input(H, "Choose your CLOAK.", "BARE YOUR MASTER'S HERALDRY.") as anything in tabards
switch(tabard_choice)
if("Black Jupon")
Expand All @@ -276,6 +284,10 @@ LICH SKELETONS
if("Black Cloak + Greathood")
cloak = /obj/item/clothing/cloak/half/lich
mask = /obj/item/clothing/cloak/tabard/stabard/guardhood/lich
//Caustic Edit
if("Zizite Tabard")
cloak = /obj/item/clothing/cloak/tabard/zizo
//Caustic Edit end

H.energy = H.max_energy

Expand Down Expand Up @@ -330,7 +342,7 @@ LICH SKELETONS
beltl = /obj/item/rogueweapon/pick/paalloy

H.adjust_blindness(-3)
var/tabards = list("Black Cloak + Greathood", "Black Jupon", "Black Tabard")
var/tabards = list("Black Cloak + Greathood", "Black Jupon", "Black Tabard", "Zizite Tabard") //Caustic Edit
var/tabard_choice = input(H, "Choose your CLOAK.", "BARE YOUR MASTER'S HERALDRY.") as anything in tabards
H.set_blindness(0)
switch(tabard_choice)
Expand All @@ -341,6 +353,10 @@ LICH SKELETONS
if("Black Cloak + Greathood")
cloak = /obj/item/clothing/cloak/half/lich
mask = /obj/item/clothing/cloak/tabard/stabard/guardhood/lich
//Caustic Edit
if("Zizite Tabard")
cloak = /obj/item/clothing/cloak/tabard/zizo
//Caustic Edit end

H.energy = H.max_energy

Expand Down Expand Up @@ -405,14 +421,18 @@ LICH SKELETONS
if("Dagger")
beltr = /obj/item/rogueweapon/huntingknife/idagger/steel/padagger
H.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE)
var/tabards = list("Black Cloak + Greathood", "Black Jupon")
var/tabards = list("Black Cloak + Greathood", "Black Jupon", "Zizite Tabard") //Caustic Edit
var/tabard_choice = input(H, "Choose your CLOAK.", "BARE YOUR MASTER'S HERALDRY.") as anything in tabards
switch(tabard_choice)
if("Black Jupon")
cloak = /obj/item/clothing/cloak/tabard/stabard/surcoat/lich
if("Black Cloak + Greathood")
cloak = /obj/item/clothing/cloak/half/lich
mask = /obj/item/clothing/cloak/tabard/stabard/guardhood/lich
//Caustic Edit
if("Zizite Tabard")
cloak = /obj/item/clothing/cloak/tabard/zizo
//Caustic Edit end

H.energy = H.max_energy

Expand Down Expand Up @@ -473,13 +493,18 @@ LICH SKELETONS
l_hand = /obj/item/rogueweapon/shield/tower/metal/palloy
H.adjust_skillrank(/datum/skill/combat/whipsflails, 1, TRUE)
H.adjust_skillrank(/datum/skill/combat/shields, 1, TRUE)
var/tabards = list("Black Tabard", "Black Jupon")
var/tabards = list("Black Tabard", "Black Jupon", "Zizite Tabard") //Caustic Edit
var/tabard_choice = input(H, "Choose your CLOAK.", "BARE YOUR MASTER'S HERALDRY.") as anything in tabards
switch(tabard_choice)
if("Black Jupon")
cloak = /obj/item/clothing/cloak/tabard/stabard/surcoat/lich
if("Black Tabard")
cloak = /obj/item/clothing/cloak/tabard/lich
//Caustic Edit
if("Zizite Tabard")
cloak = /obj/item/clothing/cloak/tabard/zizo
//Caustic Edit end


H.energy = H.max_energy

Expand Down Expand Up @@ -637,13 +662,17 @@ LICH SKELETONS
existing_eyes.Remove(H, TRUE)
existing_eyes.Insert(H)

var/tabards = list("Black Tabard", "Black Jupon")
var/tabards = list("Black Tabard", "Black Jupon", "Zizite Tabard") //Caustic Edit
var/tabard_choice = input(H, "Choose your CLOAK.", "BARE YOUR MASTER'S HERALDRY.") as anything in tabards
switch(tabard_choice)
if("Black Jupon")
cloak = /obj/item/clothing/cloak/tabard/stabard/surcoat/lich
if("Black Tabard")
cloak = /obj/item/clothing/cloak/tabard/lich
//Caustic Edit
if("Zizite Tabard")
cloak = /obj/item/clothing/cloak/tabard/zizo
//Caustic Edit end

H.energy = H.max_energy

Expand Down
5 changes: 2 additions & 3 deletions code/modules/spells/roguetown/necromancer/bone_chill.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,8 @@

var/mob/living/target = targets[1]
if(target.mob_biotypes & MOB_UNDEAD) //positive energy harms the undead
var/obj/item/bodypart/affecting = target.get_bodypart(check_zone(user.zone_selected))
if(affecting && (affecting.heal_damage(50, 50) || affecting.heal_wounds(50)))
target.update_damage_overlays()
target.apply_status_effect(/datum/status_effect/buff/healing, 10) //Caustic edit
target.update_damage_overlays() //Caustic edit
target.visible_message(span_danger("[target] reforms under the vile energy!"), span_notice("I'm remade by dark magic!"))
return TRUE

Expand Down
12 changes: 8 additions & 4 deletions code/modules/spells/roguetown/necromancer/raise_undead_formation.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,17 @@
overlay_state = "animate"
range = 7
sound = list('sound/magic/magnet.ogg')
releasedrain = 40
chargetime = 6 SECONDS
//Caustic Edit
releasedrain = 20
chargetime = 2 SECONDS
warnie = "spellwarning"
no_early_release = TRUE
charging_slowdown = 1
chargedloop = /datum/looping_sound/invokegen
gesture_required = TRUE // Summon spell
associated_skill = /datum/skill/magic/arcane
recharge_time = 20 SECONDS
recharge_time = 15 SECONDS
//Caustic Edit end
var/cabal_affine = FALSE
var/is_summoned = FALSE
var/to_spawn = 4
Expand Down Expand Up @@ -80,7 +82,9 @@
/obj/effect/proc_holder/spell/invoked/raise_undead_formation/necromancer
cabal_affine = TRUE
is_summoned = TRUE
recharge_time = 35 SECONDS
//Caustic Edit
recharge_time = 20 SECONDS
//Caustic Edit end
to_spawn = 3


18 changes: 12 additions & 6 deletions code/modules/spells/roguetown/necromancer/raise_undead_guard.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,25 @@

/obj/effect/proc_holder/spell/invoked/raise_undead_guard
name = "Conjure Undead"
desc = "Invoke forbidden magicka to summon a mindless, shambling skeleton. </br>Mindless skeletons can be given orders to guard, patrol, and attack by their \
summoner. </br>These skeletons are weaker than their more complex-jointed counterparts, but are harder to incapacitate."
//Caustic Edit
desc = "Invoke forbidden magicka to summon a mindless, shambling skeleton. </br>These Mindless skeletons can not be given orders to guard, patrol, and attack by their \
summoner. </br>These skeletons are stronger than their less complex-jointed counterparts."
//Caustic Edit end
clothes_req = FALSE
overlay_state = "animate"
range = 7
sound = list('sound/magic/magnet.ogg')
releasedrain = 40
chargetime = 3 SECONDS
//Caustic Edit
releasedrain = 20
chargetime = 2 SECONDS
warnie = "spellwarning"
no_early_release = TRUE
charging_slowdown = 1
chargedloop = /datum/looping_sound/invokegen
gesture_required = TRUE // Summon spell
associated_skill = /datum/skill/magic/arcane
recharge_time = 30 SECONDS
recharge_time = 20 SECONDS
//Caustic Edit end
hide_charge_effect = TRUE

/obj/effect/proc_holder/spell/invoked/raise_undead_guard/cast(list/targets, mob/living/user)
Expand All @@ -32,7 +36,9 @@
return FALSE

new /obj/effect/temp_visual/gib_animation(T, "gibbed-h")
var/mob/living/skeleton_new = new /mob/living/carbon/human/species/skeleton/npc/bogguard(T, user)
//Caustic Edit
var/mob/living/skeleton_new = new /mob/living/carbon/human/species/skeleton/npc/summon/random(T, user)
//Caustic Edit end
spawn(11) //Ashamed of this but I hate how after_creation() uses spawn too and I'm not making a timer for this. Proc needs a look-over. - Ryan
skeleton_new.faction |= list("cabal", "[user.mind.current.real_name]_faction")
return TRUE
14 changes: 9 additions & 5 deletions code/modules/spells/roguetown/necromancer/tame_undead.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@

/obj/effect/proc_holder/spell/invoked/tame_undead
name = "Tame Undead"
//Caustic Edit
desc = "Oftentymes, husks and shamblers walk aimlessly - uncertain of their future. They need not look further, any longer. \
Requires the target to be within four tiles. Works on undead animals, too."
Requires the target to be within seven tiles. Works on undead animals, too."
//Caustic Edit end
overlay_state = "raiseskele"
range = 4
//Caustic Edit
range = 7
warnie = "sydwarning"
recharge_time = 60 SECONDS
releasedrain = 40
chargetime = 5 SECONDS
recharge_time = 5 SECONDS
releasedrain = 10
chargetime = 1 SECONDS
charging_slowdown = 1
//Caustic Edit end
gesture_required = TRUE
chargedloop = /datum/looping_sound/invokegen
no_early_release = TRUE
Expand Down
19 changes: 19 additions & 0 deletions modular_causticcove/code/modules/clothing/rogueclothes/cloaks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/obj/item/clothing/cloak/tabard/zizo_alt
name = "Zizo tabard"
desc = "An outer garment commonly worn by soldiers. This one is worn down and has HER symbol on it."
icon_state = "tabard_zizo_alt"
icon = 'modular_causticcove/icons/clothing/tabards.dmi'
mob_overlay_icon = 'modular_causticcove/icons/clothing/onmob/tabards.dmi'
sleeved = 'modular_causticcove/icons/clothing/onmob/tabards.dmi'
sleevetype = "shirt"
sellprice = 10 //Religious...

/obj/item/clothing/cloak/tabard/zizo
name = "Zizo tabard"
desc = "An outer garment commonly worn by soldiers. This one has HER symbol on it."
icon_state = "tabard_zizo"
icon = 'modular_causticcove/icons/clothing/tabards.dmi'
mob_overlay_icon = 'modular_causticcove/icons/clothing/onmob/tabards.dmi'
sleeved = 'modular_causticcove/icons/clothing/onmob/tabards.dmi'
sleevetype = "shirt"
sellprice = 10 //Religious...
Loading
Loading