From 008ab50d9083a231d5b085ca8ae31d72794e6303 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Tue, 15 Aug 2017 02:30:27 -0400 Subject: [PATCH 1/3] dammit --- code/game/gamemodes/cult/cult_items.dm | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index abc8aa8952f..8475a53bd92 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -45,12 +45,21 @@ /obj/item/weapon/melee/cultblade/dagger/afterattack(atom/target, mob/living/carbon/human/user) ..() + if(!iscultist(user)) + user.Weaken(5) + user.unEquip(src, 1) + user.visible_message("A powerful force shoves [user] away from [target]!", \ + "\"You shouldn't play with sharp things. You'll poke someone's eye out.\"") + if(ishuman(user)) + var/mob/living/carbon/human/H = user + H.apply_damage(rand(force/2, force), BRUTE, pick("l_arm", "r_arm")) + else + user.adjustBruteLoss(rand(force/2,force)) + if(ishuman(target)) var/mob/living/carbon/human/H = target - if(!(cooldown > world.time) && ((H.stat != DEAD) && !(NO_BLOOD in H.species.species_traits))) - user.visible_message("The runes on the blade absorb the blood of [H]!") - H.bleed(5000) - cooldown = world.time + 2400 + if((H.stat != DEAD) && !(NO_BLOOD in H.species.species_traits)) + H.bleed(5) /obj/item/weapon/restraints/legcuffs/bola/cult name = "runed bola" From ca17cc865c87642cb6bc596a4b1901aebdc256f9 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Tue, 15 Aug 2017 23:55:29 -0400 Subject: [PATCH 2/3] tweak --- code/game/gamemodes/cult/cult_items.dm | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index 8475a53bd92..aa92793611f 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -43,23 +43,12 @@ embed_chance = 75 var/cooldown = 0 -/obj/item/weapon/melee/cultblade/dagger/afterattack(atom/target, mob/living/carbon/human/user) +/obj/item/weapon/melee/cultblade/dagger/attack(atom/target, mob/living/carbon/human/user) ..() - if(!iscultist(user)) - user.Weaken(5) - user.unEquip(src, 1) - user.visible_message("A powerful force shoves [user] away from [target]!", \ - "\"You shouldn't play with sharp things. You'll poke someone's eye out.\"") - if(ishuman(user)) - var/mob/living/carbon/human/H = user - H.apply_damage(rand(force/2, force), BRUTE, pick("l_arm", "r_arm")) - else - user.adjustBruteLoss(rand(force/2,force)) - if(ishuman(target)) var/mob/living/carbon/human/H = target if((H.stat != DEAD) && !(NO_BLOOD in H.species.species_traits)) - H.bleed(5) + H.bleed(50) /obj/item/weapon/restraints/legcuffs/bola/cult name = "runed bola" From 66fc88f4af5ce92e7dfd7a1214ee741630234f61 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Fri, 25 Aug 2017 20:48:05 -0400 Subject: [PATCH 3/3] Shoo.. --- code/game/gamemodes/cult/cult_items.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index aa92793611f..39099fb7d44 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -41,7 +41,6 @@ force = 15 throwforce = 25 embed_chance = 75 - var/cooldown = 0 /obj/item/weapon/melee/cultblade/dagger/attack(atom/target, mob/living/carbon/human/user) ..()