diff --git a/code/game/objects/items/rogueitems/necro_relics.dm b/code/game/objects/items/rogueitems/necro_relics.dm index 2186b9e6564..d07819c35cb 100644 --- a/code/game/objects/items/rogueitems/necro_relics.dm +++ b/code/game/objects/items/rogueitems/necro_relics.dm @@ -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) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/wretch/necromancer.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/wretch/necromancer.dm index d7772e0fce1..a44abe4395a 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/wretch/necromancer.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/wretch/necromancer.dm @@ -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) diff --git a/code/modules/jobs/job_types/roguetown/other/lich_skeleton.dm b/code/modules/jobs/job_types/roguetown/other/lich_skeleton.dm index 2c346ece39a..8a129e4a585 100644 --- a/code/modules/jobs/job_types/roguetown/other/lich_skeleton.dm +++ b/code/modules/jobs/job_types/roguetown/other/lich_skeleton.dm @@ -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") @@ -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 @@ -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") @@ -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 @@ -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") @@ -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 @@ -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) @@ -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 @@ -405,7 +421,7 @@ 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") @@ -413,6 +429,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 @@ -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 @@ -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 diff --git a/code/modules/spells/roguetown/necromancer/bone_chill.dm b/code/modules/spells/roguetown/necromancer/bone_chill.dm index 6d85509fd5e..1d746f826b5 100644 --- a/code/modules/spells/roguetown/necromancer/bone_chill.dm +++ b/code/modules/spells/roguetown/necromancer/bone_chill.dm @@ -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 diff --git a/code/modules/spells/roguetown/necromancer/raise_undead_formation.dm b/code/modules/spells/roguetown/necromancer/raise_undead_formation.dm index 41263fb5c14..6549a3c74ac 100644 --- a/code/modules/spells/roguetown/necromancer/raise_undead_formation.dm +++ b/code/modules/spells/roguetown/necromancer/raise_undead_formation.dm @@ -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 @@ -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 diff --git a/code/modules/spells/roguetown/necromancer/raise_undead_guard.dm b/code/modules/spells/roguetown/necromancer/raise_undead_guard.dm index 96b38a47d41..3793601d539 100644 --- a/code/modules/spells/roguetown/necromancer/raise_undead_guard.dm +++ b/code/modules/spells/roguetown/necromancer/raise_undead_guard.dm @@ -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.
Mindless skeletons can be given orders to guard, patrol, and attack by their \ - summoner.
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.
These Mindless skeletons can not be given orders to guard, patrol, and attack by their \ + summoner.
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) @@ -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 diff --git a/code/modules/spells/roguetown/necromancer/tame_undead.dm b/code/modules/spells/roguetown/necromancer/tame_undead.dm index 65bd407ae84..640f2f44a84 100644 --- a/code/modules/spells/roguetown/necromancer/tame_undead.dm +++ b/code/modules/spells/roguetown/necromancer/tame_undead.dm @@ -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 diff --git a/modular_causticcove/code/modules/clothing/rogueclothes/cloaks.dm b/modular_causticcove/code/modules/clothing/rogueclothes/cloaks.dm new file mode 100644 index 00000000000..21e3fa096d7 --- /dev/null +++ b/modular_causticcove/code/modules/clothing/rogueclothes/cloaks.dm @@ -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... diff --git a/modular_causticcove/code/modules/mob/living/carbon/human/npc/skeleton/skeleton_necromancer.dm b/modular_causticcove/code/modules/mob/living/carbon/human/npc/skeleton/skeleton_necromancer.dm new file mode 100644 index 00000000000..0a001caa947 --- /dev/null +++ b/modular_causticcove/code/modules/mob/living/carbon/human/npc/skeleton/skeleton_necromancer.dm @@ -0,0 +1,171 @@ +/mob/living/carbon/human/species/skeleton/npc/summon/soldier + skel_outfit = /datum/outfit/job/roguetown/skeleton/npc/soldier + +/mob/living/carbon/human/species/skeleton/npc/summon/spear + skel_outfit = /datum/outfit/job/roguetown/skeleton/npc/spear + +/mob/living/carbon/human/species/skeleton/npc/summon/heavy + skel_outfit = /datum/outfit/job/roguetown/skeleton/npc/heavy + +/mob/living/carbon/human/species/skeleton/npc/summon/dagger + skel_outfit = /datum/outfit/job/roguetown/skeleton/npc/dagger + +/mob/living/carbon/human/species/skeleton/npc/summon/hammer + skel_outfit = /datum/outfit/job/roguetown/skeleton/npc/hammer + + +/mob/living/carbon/human/species/skeleton/npc/summon/random + +/mob/living/carbon/human/species/skeleton/npc/summon/random/Initialize() + var/outfit = rand(1, 5) + switch(outfit) + if(1) + skel_outfit = /datum/outfit/job/roguetown/skeleton/npc/soldier + if(2) + skel_outfit = /datum/outfit/job/roguetown/skeleton/npc/spear + if(3) + skel_outfit = /datum/outfit/job/roguetown/skeleton/npc/heavy + if(4) + skel_outfit = /datum/outfit/job/roguetown/skeleton/npc/dagger + if(5) + skel_outfit = /datum/outfit/job/roguetown/skeleton/npc/hammer + ..() + +/datum/outfit/job/roguetown/skeleton/npc/soldier/pre_equip(mob/living/carbon/human/H) + ..() + H.STASTR = rand(12,14) + H.STASPD = 8 + H.STACON = 7 + H.STAWIL = 12 + H.STAINT = 1 + ADD_TRAIT(H, TRAIT_HEAVYARMOR, TRAIT_GENERIC) + H.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) + H.adjust_skillrank(/datum/skill/combat/maces, 3, TRUE) + H.adjust_skillrank(/datum/skill/combat/axes, 3, TRUE) + H.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) + H.adjust_skillrank(/datum/skill/combat/shields, 2, TRUE) + H.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + name = "Zizite Soldier" + cloak = /obj/item/clothing/cloak/tabard/zizo_alt + head = /obj/item/clothing/head/roguetown/helmet/sallet/iron + armor = /obj/item/clothing/suit/roguetown/armor/plate/cuirass/iron + shirt = /obj/item/clothing/suit/roguetown/armor/chainmail/iron + pants = /obj/item/clothing/under/roguetown/chainlegs/iron + shoes = /obj/item/clothing/shoes/roguetown/boots/armor/iron + gloves = /obj/item/clothing/gloves/roguetown/chain/iron + l_hand = /obj/item/rogueweapon/shield/ironshzizo + r_hand = /obj/item/rogueweapon/sword/iron + +/datum/outfit/job/roguetown/skeleton/npc/spear/pre_equip(mob/living/carbon/human/H) + ..() + H.STASTR = rand(12,14) + H.STASPD = 8 + H.STACON = 7 + H.STAWIL = 12 + H.STAINT = 1 + ADD_TRAIT(H, TRAIT_HEAVYARMOR, TRAIT_GENERIC) + H.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) + H.adjust_skillrank(/datum/skill/combat/maces, 3, TRUE) + H.adjust_skillrank(/datum/skill/combat/axes, 3, TRUE) + H.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) + H.adjust_skillrank(/datum/skill/combat/shields, 2, TRUE) + H.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + name = "Zizite Spearman" + cloak = /obj/item/clothing/cloak/tabard/zizo_alt + head = /obj/item/clothing/head/roguetown/helmet/kettle/iron + armor = /obj/item/clothing/suit/roguetown/armor/plate/cuirass/iron + shirt = /obj/item/clothing/suit/roguetown/armor/gambeson + pants = /obj/item/clothing/under/roguetown/chainlegs/iron/kilt + shoes = /obj/item/clothing/shoes/roguetown/boots/armor/iron + gloves = /obj/item/clothing/gloves/roguetown/fingerless_leather + r_hand = /obj/item/rogueweapon/spear + +/datum/outfit/job/roguetown/skeleton/npc/heavy/pre_equip(mob/living/carbon/human/H) + ..() + H.STASTR = 14 + H.STASPD = 6 + H.STACON = 9 + H.STAWIL = 14 + H.STAINT = 1 + ADD_TRAIT(H, TRAIT_HEAVYARMOR, TRAIT_GENERIC) + H.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) + H.adjust_skillrank(/datum/skill/combat/maces, 3, TRUE) + H.adjust_skillrank(/datum/skill/combat/axes, 3, TRUE) + H.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) + H.adjust_skillrank(/datum/skill/combat/shields, 2, TRUE) + H.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + name = "Zizite Heavy" + cloak = /obj/item/clothing/cloak/tabard/zizo_alt + head = /obj/item/clothing/head/roguetown/helmet/heavy/bucket/iron + armor = /obj/item/clothing/suit/roguetown/armor/plate/iron + shirt = /obj/item/clothing/suit/roguetown/armor/chainmail/iron + pants = /obj/item/clothing/under/roguetown/chainlegs/iron + shoes = /obj/item/clothing/shoes/roguetown/boots/armor/iron + gloves = /obj/item/clothing/gloves/roguetown/plate/iron + r_hand = /obj/item/rogueweapon/greatsword/iron + +/datum/outfit/job/roguetown/skeleton/npc/dagger/pre_equip(mob/living/carbon/human/H) + ..() + H.STASTR = 12 + H.STASPD = 14 + H.STACON = 4 + H.STAWIL = 12 + H.STAINT = 1 + H.STAPER = 14 + ADD_TRAIT(H, TRAIT_HEAVYARMOR, TRAIT_GENERIC) + H.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) + H.adjust_skillrank(/datum/skill/combat/maces, 3, TRUE) + H.adjust_skillrank(/datum/skill/combat/axes, 3, TRUE) + H.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) + H.adjust_skillrank(/datum/skill/combat/shields, 2, TRUE) + H.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + name = "Zizite Rogue" + cloak = /obj/item/clothing/cloak/tabard/zizo_alt + mask = /obj/item/clothing/mask/rogue/facemask + armor = /obj/item/clothing/suit/roguetown/armor/plate/cuirass/iron + shirt = /obj/item/clothing/suit/roguetown/armor/gambeson + pants = /obj/item/clothing/under/roguetown/chainlegs/iron/kilt + shoes = /obj/item/clothing/shoes/roguetown/boots/armor/iron + gloves = /obj/item/clothing/gloves/roguetown/fingerless_leather + l_hand = /obj/item/rogueweapon/huntingknife/idagger + r_hand = /obj/item/rogueweapon/huntingknife/idagger + +/datum/outfit/job/roguetown/skeleton/npc/hammer/pre_equip(mob/living/carbon/human/H) + ..() + H.STASTR = rand(12,14) + H.STASPD = 8 + H.STACON = 7 + H.STAWIL = 12 + H.STAINT = 1 + ADD_TRAIT(H, TRAIT_HEAVYARMOR, TRAIT_GENERIC) + H.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) + H.adjust_skillrank(/datum/skill/combat/maces, 3, TRUE) + H.adjust_skillrank(/datum/skill/combat/axes, 3, TRUE) + H.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) + H.adjust_skillrank(/datum/skill/combat/shields, 2, TRUE) + H.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + name = "Zizite Breaker" + cloak = /obj/item/clothing/cloak/tabard/zizo_alt + head = /obj/item/clothing/head/roguetown/helmet/sallet/iron + armor = /obj/item/clothing/suit/roguetown/armor/plate/cuirass/iron + shirt = /obj/item/clothing/suit/roguetown/armor/chainmail/iron + pants = /obj/item/clothing/under/roguetown/chainlegs/iron + shoes = /obj/item/clothing/shoes/roguetown/boots/armor/iron + gloves = /obj/item/clothing/gloves/roguetown/chain/iron + l_hand = /obj/item/rogueweapon/shield/ironshzizo + r_hand = /obj/item/rogueweapon/mace/warhammer diff --git a/modular_causticcove/code/modules/shields/shields.dm b/modular_causticcove/code/modules/shields/shields.dm new file mode 100644 index 00000000000..3eab36191e5 --- /dev/null +++ b/modular_causticcove/code/modules/shields/shields.dm @@ -0,0 +1,26 @@ +/obj/item/rogueweapon/shield/ironshzizo + name = "Zizoid shield" + desc = "A heavy and encumbering iron shield. This one has HER symbol painted on it." + icon_state = "ironshzizo" + icon = 'modular_causticcove/icons/weapons/shields32.dmi' + force = 20 + throwforce = 25 // "I can do this all day." + dropshrink = 0.8 + coverage = 50 + resistance_flags = null + flags_1 = CONDUCT_1 + attacked_sound = list('sound/combat/parry/shield/metalshield (1).ogg','sound/combat/parry/shield/metalshield (2).ogg','sound/combat/parry/shield/metalshield (3).ogg') + parrysound = list('sound/combat/parry/shield/metalshield (1).ogg','sound/combat/parry/shield/metalshield (2).ogg','sound/combat/parry/shield/metalshield (3).ogg') + possible_item_intents = list(SHIELD_SMASH_METAL, SHIELD_BLOCK) // No SHIELD_BASH. Too heavy to swing quickly, or something. + max_integrity = 220 + anvilrepair = /datum/skill/craft/weaponsmithing + +/obj/item/rogueweapon/shield/ironshzizo/getonmobprop(tag) + . = ..() + if(tag) + switch(tag) + if("gen") + return list("shrink" = 0.6,"sx" = -5,"sy" = -1,"nx" = 6,"ny" = -1,"wx" = 0,"wy" = -2,"ex" = 0,"ey" = -2,"northabove" = 0,"southabove" = 1,"eastabove" = 1,"westabove" = 0,"nturn" = 0,"sturn" = 0,"wturn" = 0,"eturn" = 0,"nflip" = 0,"sflip" = 0,"wflip" = 0,"eflip" = 0) + if("onback") + return list("shrink" = 0.6,"sx" = 1,"sy" = 4,"nx" = 1,"ny" = 2,"wx" = 3,"wy" = 3,"ex" = -3,"ey" = 3,"nturn" = 0,"sturn" = 0,"wturn" = 0,"eturn" = 0,"nflip" = 8,"sflip" = 0,"wflip" = 0,"eflip" = 0,"northabove" = 1,"southabove" = 0,"eastabove" = 0,"westabove" = 0) + diff --git a/modular_causticcove/icons/clothing/onmob/tabards.dmi b/modular_causticcove/icons/clothing/onmob/tabards.dmi new file mode 100644 index 00000000000..1302f509722 Binary files /dev/null and b/modular_causticcove/icons/clothing/onmob/tabards.dmi differ diff --git a/modular_causticcove/icons/clothing/tabards.dmi b/modular_causticcove/icons/clothing/tabards.dmi new file mode 100644 index 00000000000..6fe453aee3c Binary files /dev/null and b/modular_causticcove/icons/clothing/tabards.dmi differ diff --git a/modular_causticcove/icons/weapons/shields32.dmi b/modular_causticcove/icons/weapons/shields32.dmi new file mode 100644 index 00000000000..a09a4f9a58c Binary files /dev/null and b/modular_causticcove/icons/weapons/shields32.dmi differ diff --git a/roguetown.dme b/roguetown.dme index d1e3cfedc76..3d4ec0d1a03 100644 --- a/roguetown.dme +++ b/roguetown.dme @@ -3485,6 +3485,7 @@ #include "modular_causticcove\code\modules\classes\shrine_priest\shrine_guardian.dm" #include "modular_causticcove\code\modules\classes\shrine_priest\shrine_priest.dm" #include "modular_causticcove\code\modules\client\customizers\organ\genitals.dm" +#include "modular_causticcove\code\modules\clothing\rogueclothes\cloaks.dm" #include "modular_causticcove\code\modules\dcbot\config.dm" #include "modular_causticcove\code\modules\dcbot\internaltools\ahelprelay.dm" #include "modular_causticcove\code\modules\dcbot\internaltools\whitelost.dm" @@ -3518,6 +3519,7 @@ #include "modular_causticcove\code\modules\mob\living\carbon\hobgoblin\hobgoblin.dm" #include "modular_causticcove\code\modules\mob\living\carbon\hobgoblin\npc\hobgoblin_npc.dm" #include "modular_causticcove\code\modules\mob\living\carbon\hobgoblin\species\hobgoblin_species.dm" +#include "modular_causticcove\code\modules\mob\living\carbon\human\npc\skeleton\skeleton_necromancer.dm" #include "modular_causticcove\code\modules\mob\living\carbon\human\species_types\witchshape\bat.dm" #include "modular_causticcove\code\modules\mob\living\carbon\human\species_types\witchshape\cabbit.dm" #include "modular_causticcove\code\modules\mob\living\carbon\human\species_types\witchshape\cat.dm" @@ -3538,6 +3540,7 @@ #include "modular_causticcove\code\modules\roguecrafting\leather.dm" #include "modular_causticcove\code\modules\roguetown\roguejobs\alchemist\herb_flora.dm" #include "modular_causticcove\code\modules\roguetown\roguestock\import.dm" +#include "modular_causticcove\code\modules\shields\shields.dm" #include "modular_causticcove\code\modules\size_scaling\helperfunctions.dm" #include "modular_causticcove\code\modules\size_scaling\mobholder.dm" #include "modular_causticcove\code\modules\size_scaling\prefs.dm"