From 6b520693e70bf9af948bfcf1dfbe4590dde88c56 Mon Sep 17 00:00:00 2001 From: LazennG <58535870+LazennG@users.noreply.github.com> Date: Wed, 15 Jun 2022 03:35:38 -0700 Subject: [PATCH 1/5] this is everything i think idk it's 330am --- code/modules/clothing/gloves/miscellaneous.dm | 29 ++++++++++--------- .../mining/lavaland/necropolis_chests.dm | 26 +++++++++++++---- code/modules/spells/spell_types/conjure.dm | 4 +-- code/modules/spells/spell_types/godhand.dm | 12 ++++---- 4 files changed, 44 insertions(+), 27 deletions(-) diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index 619c6fa3c982..ce409a84d745 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -95,7 +95,7 @@ /obj/item/clothing/gloves/bracer/cuffs name = "rabid cuffs" - desc = "Chainless manacles fashioned after one of the hungriest slaughter demons. Wearing these invokes a hunger in the wearer that can only be sated by bloodshed." + desc = "Wristbands fashioned after one of the hungriest slaughter demons. Wearing these invokes a hunger in the wearer that can only be sated by bloodshed." icon_state = "cuff" item_state = "cuff" var/obj/effect/proc_holder/swipe/swipe_ability @@ -116,7 +116,7 @@ obj/effect/proc_holder/swipe name = "Swipe" - desc = "Swipe at a target area, dealing damage and consuming dead entities to heal yourself. Creatures take 30 damage while people and cyborgs take 10 damage. Consumed creatures explode into gibs and give the most healing, and people and cyborgs heal for the least. People and cyborgs who have been thoroughly burned and bruised heal you for slightly more! People are ineligible for total consumption." + desc = "Swipe at a target area, dealing damage and healing yourself. Creatures take 60 damage while people and cyborgs take 20 damage. Living creatures hit with this ability will heal the user for 15 brute/burn/poison while dead ones heal for 20 and get butchered. People and cyborgs hit will heal for 5" action_background_icon_state = "bg_demon" action_icon = 'icons/mob/actions/actions_items.dmi' action_icon_state = "cuff" @@ -154,32 +154,33 @@ obj/effect/proc_holder/swipe return if(!istype(T)) return + if(!(T in range(9, caller))) + to_chat(caller, warning("The target is too far!")) + return new /obj/effect/temp_visual/bubblegum_hands/rightpaw(T) new /obj/effect/temp_visual/bubblegum_hands/rightthumb(T) - to_chat(L, span_userdanger("A claw swipes at you!")) + to_chat(L, span_userdanger("Claws reach out from the floor and maul you!")) to_chat(ranged_ability_user, "You summon claws at [L]'s location!") + L.visible_message(span_warning("[caller] swipes huge claws at [L]!")) for(L in range(0,T)) playsound(T, 'sound/magic/demon_attack1.ogg', 80, 5, -1) if(isanimal(L)) - L.adjustBruteLoss(30) + L.adjustBruteLoss(60) if(L.stat == DEAD) L.gib() + to_chat(caller, span_notice("You're able to the body entirely!")) caller.adjustBruteLoss(-20) caller.adjustFireLoss(-20) caller.adjustToxLoss(-20) - caller.blood_volume = BLOOD_VOLUME_NORMAL(caller)*1.10 - L.adjustBruteLoss(10) - if(L.getBruteLoss()+L.getFireLoss() >= 299) - to_chat(caller, span_notice("You're able to consume a bit more of the body, as it was previously softened up!")) - caller.adjustBruteLoss(-15) - caller.adjustFireLoss(-15) - caller.adjustToxLoss(-15) - caller.blood_volume = BLOOD_VOLUME_NORMAL(caller)*1.05 - if(L.stat == DEAD) + if(L.stat != DEAD) + caller.adjustBruteLoss(-13) + caller.adjustFireLoss(-13) + caller.adjustToxLoss(-13) + if(iscarbon(L)) + L.adjustBruteLoss(20) caller.adjustBruteLoss(-5) caller.adjustFireLoss(-5) caller.adjustToxLoss(-5) - caller.blood_volume = BLOOD_VOLUME_NORMAL(caller)*1.01 COOLDOWN_START(src, scan_cooldown, cooldown) addtimer(CALLBACK(src, .proc/cooldown_over, ranged_ability_user), cooldown) remove_ranged_ability() diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index b2151549626f..d80596069498 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -1136,6 +1136,7 @@ GLOBAL_LIST_EMPTY(bloodmen_list) #define COOLDOWN 150 #define COOLDOWN_HUMAN 100 #define COOLDOWN_ANIMAL 60 +#define COOLDOWN_SPLASH 100 /obj/item/melee/knuckles name = "bloody knuckles" desc = "Knuckles born of a desire for violence. Made to ensure their victims stay in the fight until there's a winner." @@ -1148,7 +1149,9 @@ GLOBAL_LIST_EMPTY(bloodmen_list) force = 18 var/next_reach = 0 var/next_grip = 0 + var/next_splash = 0 var/next_knuckle = 0 + var/splash_range = 9 attack_verb = list("thrashed", "pummeled", "walloped") actions_types = list(/datum/action/item_action/reach, /datum/action/item_action/visegrip) @@ -1168,6 +1171,19 @@ GLOBAL_LIST_EMPTY(bloodmen_list) return next_knuckle = world.time + COOLDOWN_ANIMAL +/obj/item/melee/knuckles/attack_self(mob/living/user) + var/turf/T = get_turf(user) + if(next_splash > world.time) + to_chat(user, span_warning("You can't do that yet!")) + return + user.visible_message(span_warning("[user] splashes blood from their knuckles!")) + playsound(T, 'splat.ogg', 80, 5, -1) + for(var/i = 0 to splash_range) + if(T) + user.add_splatter_floor(T) + T = get_step(T,user.dir) + next_splash = world.time + COOLDOWN + /obj/item/melee/knuckles/ui_action_click(mob/living/user, action) var/mob/living/U = user if(istype(action, /datum/action/item_action/reach)) @@ -1575,15 +1591,15 @@ GLOBAL_LIST_EMPTY(bloodmen_list) /obj/item/organ/grandcore/Remove(mob/living/carbon/H, special = 0) H.faction -= "blooded" - H.RemoveSpell (/obj/effect/proc_holder/spell/targeted/touch/raise, /obj/effect/proc_holder/spell/aoe_turf/horde) - H.RemoveSpell (new /obj/effect/proc_holder/spell/aoe_turf/horde) + H.RemoveSpell (/obj/effect/proc_holder/spell/targeted/touch/raise) + H.RemoveSpell (/obj/effect/proc_holder/spell/aoe_turf/horde) ..() /datum/action/item_action/organ_action/threebloodlings name = "Summon bloodlings" - desc = "Summon a conjure a few bloodlings at the cost of 13% blood (8 brain damage for those without blood)." + desc = "Summon a conjure a few bloodlings at the cost of 6% blood or 8 brain damage for races without blood." var/next_expulsion = 0 - var/cooldown = 10 //wheres the risk if it has a reasonable cooldown? + var/cooldown = 10 /datum/action/item_action/organ_action/threebloodlings/Trigger() var/mob/living/carbon/H = owner @@ -1596,6 +1612,6 @@ GLOBAL_LIST_EMPTY(bloodmen_list) to_chat(H, "Your head pounds as you produce bloodlings!") else to_chat(H, "You spill your blood, and it comes to life as bloodlings!") - H.blood_volume -= 70 //like 13% of your blood taken + H.blood_volume -= 35 spawn_atom_to_turf(/mob/living/simple_animal/hostile/asteroid/hivelordbrood/bloodling, owner, 3, TRUE) //think 1 in 4 is a good chance of not being targeted by fauna next_expulsion = world.time + cooldown diff --git a/code/modules/spells/spell_types/conjure.dm b/code/modules/spells/spell_types/conjure.dm index 4cf19ca5dd0b..756ce49e4d13 100644 --- a/code/modules/spells/spell_types/conjure.dm +++ b/code/modules/spells/spell_types/conjure.dm @@ -101,7 +101,7 @@ /obj/effect/proc_holder/spell/aoe_turf/horde name = "Horde" - desc = "Bring all your existing bloodmen to you at the cost of 18% blood (15 brain damage for those without blood)." + desc = "Bring all your existing bloodmen to you at the cost of 3% blood per bloodman or 5 brain damage per bloodman if you're a bloodless race." action_icon = 'icons/mob/actions/actions_cult.dmi' action_icon_state = "horde" var/list/summon_type = list("/mob/living/simple_animal/hostile/asteroid/hivelord/legion/bloodman") @@ -123,7 +123,7 @@ user.adjustOrganLoss(ORGAN_SLOT_BRAIN, 5) to_chat(usr, span_notice("You can almost feel your brain writhing as you call your bloodmen to you.")) else - user.blood_volume -= 30 + user.blood_volume -= 15 to_chat(usr, span_notice("You feel yourself becoming paler with every minion called.")) if(T) bloodman.forceMove(T) diff --git a/code/modules/spells/spell_types/godhand.dm b/code/modules/spells/spell_types/godhand.dm index 724248192792..0f18c664b5a2 100644 --- a/code/modules/spells/spell_types/godhand.dm +++ b/code/modules/spells/spell_types/godhand.dm @@ -141,18 +141,19 @@ /obj/item/melee/touch_attack/raisehand name = "\improper raise bloodman" - desc = "Blood covers your hand like a glove as it waits for a new host." + desc = "Prepare to raise a bloodman for about 5% of your blood or 5 brain damage if you're a bloodless race." on_use_sound = 'sound/magic/wandodeath.ogg' icon_state = "flagellation" item_state = "hivehand" color = "#FF0000" + /obj/item/melee/touch_attack/raisehand/afterattack(atom/target, mob/living/carbon/user, proximity) var/mob/living/carbon/human/M = target if(!ishuman(M) || M.stat != DEAD) - to_chat(M, span_notice("You must be targeting a dead humanoid!")) + to_chat(user, span_notice("You must be targeting a dead humanoid!")) return if(GLOB.bloodmen_list.len > 2) - to_chat(M, span_notice("You can't control that many minions!")) + to_chat(user, span_notice("You can't control that many minions!")) return if(NOBLOOD in M.dna.species.species_traits) M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 5) @@ -163,9 +164,8 @@ L.stored_mob = M M.forceMove(L) qdel(src) - user.blood_volume -= 50 // 9% blood cost, cheaper than the other spell because its not like you can stop near a corpse or find one near you in a fight - to_chat(user, "You curse the body with your blood, leaving you feeling a bit light-headed.") - + user.blood_volume -= 25 + to_chat(user, span_notice("You curse the body with your blood, leaving you feeling a bit light-headed.")) /obj/item/melee/touch_attack/pacifism name = "\improper pacifism touch" From 3968b7e6f19e8e591e9081973eb44d1e58a420fc Mon Sep 17 00:00:00 2001 From: LazennG <58535870+LazennG@users.noreply.github.com> Date: Wed, 15 Jun 2022 03:54:56 -0700 Subject: [PATCH 2/5] polishes some things for now therell probably be more later --- code/modules/mining/lavaland/necropolis_chests.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index d80596069498..92144faa1626 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -1139,7 +1139,7 @@ GLOBAL_LIST_EMPTY(bloodmen_list) #define COOLDOWN_SPLASH 100 /obj/item/melee/knuckles name = "bloody knuckles" - desc = "Knuckles born of a desire for violence. Made to ensure their victims stay in the fight until there's a winner." + desc = "Knuckles born of a desire for violence. Made to ensure their victims stay in the fight until there's a winner. Activating these knuckles covers several meters ahead of the user with blood." icon = 'icons/obj/lavaland/artefacts.dmi' icon_state = "bloodyknuckle" lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' @@ -1177,7 +1177,7 @@ GLOBAL_LIST_EMPTY(bloodmen_list) to_chat(user, span_warning("You can't do that yet!")) return user.visible_message(span_warning("[user] splashes blood from their knuckles!")) - playsound(T, 'splat.ogg', 80, 5, -1) + playsound(T, 'sound/effects/splat.ogg', 80, 5, -1) for(var/i = 0 to splash_range) if(T) user.add_splatter_floor(T) From 8b180a8d2399b035e1ee99df6cc69acbb418636e Mon Sep 17 00:00:00 2001 From: LazennG <58535870+LazennG@users.noreply.github.com> Date: Wed, 15 Jun 2022 04:00:58 -0700 Subject: [PATCH 3/5] Update miscellaneous.dm --- code/modules/clothing/gloves/miscellaneous.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index ce409a84d745..ccfd3b4cf4ba 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -116,7 +116,7 @@ obj/effect/proc_holder/swipe name = "Swipe" - desc = "Swipe at a target area, dealing damage and healing yourself. Creatures take 60 damage while people and cyborgs take 20 damage. Living creatures hit with this ability will heal the user for 15 brute/burn/poison while dead ones heal for 20 and get butchered. People and cyborgs hit will heal for 5" + desc = "Swipe at a target area, dealing damage to heal yourself. Creatures take 60 damage while people and cyborgs take 20 damage. Living creatures hit with this ability will heal the user for 15 brute/burn/poison while dead ones heal for 20 and get butchered. People and cyborgs hit will heal for 5" action_background_icon_state = "bg_demon" action_icon = 'icons/mob/actions/actions_items.dmi' action_icon_state = "cuff" From a7e4c740bc7cd2ae61e3c7ec821a9d6c4cff5129 Mon Sep 17 00:00:00 2001 From: LazennG <58535870+LazennG@users.noreply.github.com> Date: Fri, 17 Jun 2022 00:07:41 -0700 Subject: [PATCH 4/5] fuck it critical heal --- code/modules/clothing/gloves/miscellaneous.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index ccfd3b4cf4ba..e96d82077758 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -116,7 +116,7 @@ obj/effect/proc_holder/swipe name = "Swipe" - desc = "Swipe at a target area, dealing damage to heal yourself. Creatures take 60 damage while people and cyborgs take 20 damage. Living creatures hit with this ability will heal the user for 15 brute/burn/poison while dead ones heal for 20 and get butchered. People and cyborgs hit will heal for 5" + desc = "Swipe at a target area, dealing damage to heal yourself. Creatures take 60 damage while people and cyborgs take 20 damage. Living creatures hit with this ability will heal the user for 13 brute/burn/poison while dead ones heal for 20 and get butchered, while killing a creature with a swipe will heal the user for 33. People and cyborgs hit will heal for 5." action_background_icon_state = "bg_demon" action_icon = 'icons/mob/actions/actions_items.dmi' action_icon_state = "cuff" @@ -161,21 +161,21 @@ obj/effect/proc_holder/swipe new /obj/effect/temp_visual/bubblegum_hands/rightthumb(T) to_chat(L, span_userdanger("Claws reach out from the floor and maul you!")) to_chat(ranged_ability_user, "You summon claws at [L]'s location!") - L.visible_message(span_warning("[caller] swipes huge claws at [L]!")) + L.visible_message(span_warning("[caller] rends [L]!")) for(L in range(0,T)) playsound(T, 'sound/magic/demon_attack1.ogg', 80, 5, -1) if(isanimal(L)) L.adjustBruteLoss(60) + if(L.stat != DEAD) + caller.adjustBruteLoss(-13) + caller.adjustFireLoss(-13) + caller.adjustToxLoss(-13) if(L.stat == DEAD) L.gib() to_chat(caller, span_notice("You're able to the body entirely!")) caller.adjustBruteLoss(-20) caller.adjustFireLoss(-20) caller.adjustToxLoss(-20) - if(L.stat != DEAD) - caller.adjustBruteLoss(-13) - caller.adjustFireLoss(-13) - caller.adjustToxLoss(-13) if(iscarbon(L)) L.adjustBruteLoss(20) caller.adjustBruteLoss(-5) From b42188b8dea45687af1d3bcd5bfa969ea7650d7b Mon Sep 17 00:00:00 2001 From: LazennG <58535870+LazennG@users.noreply.github.com> Date: Sat, 18 Jun 2022 11:54:29 -0700 Subject: [PATCH 5/5] you're able to the body entirely --- code/modules/clothing/gloves/miscellaneous.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index e96d82077758..7447108793e6 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -172,7 +172,7 @@ obj/effect/proc_holder/swipe caller.adjustToxLoss(-13) if(L.stat == DEAD) L.gib() - to_chat(caller, span_notice("You're able to the body entirely!")) + to_chat(caller, span_notice("You're able to consume the body entirely!")) caller.adjustBruteLoss(-20) caller.adjustFireLoss(-20) caller.adjustToxLoss(-20)