spells&bloodloss

code/game/objects/items/rogueweapons/melee/knives.dm

@@ -252,22 +252,19 @@
 			if(V.disguised)
 				H.visible_message("<font color='white'>The silver weapon manifests the [H] curse!</font>")
 				to_chat(H, "<span class='userdanger'>I'm hit by my BANE!</span>")
-				H.adjustFireLoss(20)
 				H.Knockdown(20)
 				H.fire_act(1,4)
 				H.apply_status_effect(/datum/status_effect/debuff/silver_curse)
 				src.last_used = world.time
 			else
 				to_chat(H, "<span class='userdanger'>I'm hit by my BANE!</span>")
-				H.adjustFireLoss(20)
 				H.Knockdown(20)
 				H.fire_act(1,4)
 				H.apply_status_effect(/datum/status_effect/debuff/silver_curse)
 				src.last_used = world.time
 		if(V_lord)
 			if(V_lord.vamplevel < 4 && !V)
 				to_chat(H, "<span class='userdanger'>I'm hit by my BANE!</span>")
-				H.adjustFireLoss(15)
 				H.Knockdown(10)
 				H.fire_act(1,4)
 				src.last_used = world.time

code/game/objects/items/rogueweapons/melee/whips.dm

@@ -117,22 +117,22 @@
 			if(V.disguised)
 				H.visible_message("<font color='white'>The silver weapon undoes [H]'s wicked disguise!</font>")
 				to_chat(H, "<span class='userdanger'>I'm hit by my BANE!</span>")
-				H.adjustFireLoss(40)
+				H.adjustFireLoss(30)
 				H.Knockdown(30)
 				H.fire_act(1,5)
 				H.apply_status_effect(/datum/status_effect/debuff/silver_curse)
 				src.last_used = world.time
 			else
 				to_chat(H, "<span class='userdanger'>I'm hit by my BANE!</span>")
-				H.adjustFireLoss(40)
+				H.adjustFireLoss(30)
 				H.Knockdown(30)
 				H.fire_act(1,5)
 				H.apply_status_effect(/datum/status_effect/debuff/silver_curse)
 				src.last_used = world.time
 		if(V_lord)
 			if(V_lord.vamplevel < 4 && !V)
 				to_chat(H, "<span class='userdanger'>I'm hit by my BANE!</span>")
-				H.adjustFireLoss(30)
+				H.adjustFireLoss(20)
 				H.Knockdown(20)
 				H.fire_act(1,4)
 				H.apply_status_effect(/datum/status_effect/debuff/silver_curse) // Lesser curse applied still
@@ -142,6 +142,10 @@
 					H.fire_act(1,3)
 				to_chat(s_user, "<font color='red'> The silver weapon barely works against such an abomination!</font>")
 				H.visible_message(H, "<span class='userdanger'>This feeble metal can't stop me, I HAVE TRANSCENDED!</span>")
+			return
+	if((target.mob_biotypes & MOB_UNDEAD))
+		target.adjustFireLoss(25)
+		return
 
 //................ Lashkiss Whip ............... //
 /obj/item/rogueweapon/whip/spiderwhip

code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/witchhunter.dm

@@ -25,10 +25,10 @@
 	shoes = /obj/item/clothing/shoes/roguetown/boots
 	pants = /obj/item/clothing/under/roguetown/tights/black
 	cloak = /obj/item/clothing/cloak/cape/puritan
-	beltr = /obj/item/storage/belt/rogue/pouch/coins/mid
 	head = /obj/item/clothing/head/roguetown/helmet/leather/inquisitor
 	gloves = /obj/item/clothing/gloves/roguetown/leather
 	beltl = /obj/item/rogueweapon/whip/antique/silver
+	beltr = /obj/item/rogueweapon/sword/rapier/silver
 	neck = /obj/item/clothing/neck/roguetown/chaincoif
 
 	if(H.mind)

code/modules/mob/living/grabbing.dm

@@ -563,7 +563,7 @@
 					to_chat(user, "<span class='warning'>I cannot drain vitae from a fellow nitewalker.</span>")
 					return
 				else if(C.vitae_pool > 500)
-					C.blood_volume = max(C.blood_volume-45, 0)
+					C.blood_volume = max(C.blood_volume-20, 0)
 					if(ishuman(C))
 						var/mob/living/carbon/human/H = C
 						if(H.virginity)
@@ -602,7 +602,7 @@
 		if(user.mind) // We're drinking from a mob or a person who disconnected from the game
 			if(user.mind.has_antag_datum(/datum/antagonist/vampirelord))
 				var/datum/antagonist/vampirelord/VDrinker = user.mind.has_antag_datum(/datum/antagonist/vampirelord)
-				C.blood_volume = max(C.blood_volume-45, 0)
+				C.blood_volume = max(C.blood_volume-20, 0)
 				if(C.vitae_pool >= 250)
 					if(VDrinker.isspawn)
 						VDrinker.handle_vitae(250, 250)
@@ -611,7 +611,7 @@
 				else
 					to_chat(user, "<span class='warning'>And yet, not enough vitae can be extracted from them... Tsk.</span>")
 
-	C.blood_volume = max(C.blood_volume-5, 0)
+	C.blood_volume = max(C.blood_volume-60, 0)
 	C.handle_blood()
 
 	playsound(user.loc, 'sound/misc/drink_blood.ogg', 100, FALSE, -4)

code/modules/spells/roguetown/acolyte/general.dm

@@ -20,7 +20,7 @@
 		var/mob/living/target = targets[1]
 		if(target.mob_biotypes & MOB_UNDEAD) //positive energy harms the undead
 			target.visible_message("<span class='danger'>[target] is burned by holy light!</span>", "<span class='userdanger'>I'm burned by holy light!</span>")
-			target.adjustFireLoss(30)
+			target.adjustFireLoss(25)
 			target.fire_act(1,5)
 			return TRUE
 		if(target.real_name in GLOB.excommunicated_players)
@@ -179,8 +179,8 @@
 		var/mob/living/target = targets[1]
 		if(target.mob_biotypes & MOB_UNDEAD) //positive energy harms the undead
 			target.visible_message("<span class='danger'>[target] is burned by holy light!</span>", "<span class='userdanger'>I'm burned by holy light!</span>")
-			target.adjustFireLoss(100)
-			target.Paralyze(50)
+			target.adjustFireLoss(50)
+			target.Knockdown(10)
 			target.fire_act(1,5)
 			return TRUE
 		target.visible_message("<span class='info'>A wreath of gentle light passes over [target]!</span>", "<span class='notice'>I'm bathed in holy light!</span>")

code/modules/spells/roguetown/acolyte/necra.dm

@@ -69,7 +69,7 @@
 				iszombie = TRUE
 			if(L.mind.special_role == "Vampire Lord")
 				user.visible_message("<span class='warning'>[L] overpowers being churned!</span>", "<span class='userdanger'>[L] is too strong, I am churned!</span>")
-				user.Stun(50)
+				user.Knockdown(50)
 				user.throw_at(get_ranged_target_turf(user, get_dir(user,L), 7), 7, 1, L, spin = FALSE)
 				return
 		if((L.mob_biotypes & MOB_UNDEAD) || isvampire || iszombie)
@@ -80,7 +80,7 @@
 			if(prob(undead_prob))
 				L.visible_message("<span class='warning'>[L] HAS BEEN CHURNED BY NECRA'S GRIP!</span>", "<span class='danger'>I'VE BEEN CHURNED BY NECRA'S GRIP!</span>")
 				explosion(get_turf(L), light_impact_range = 1, flame_range = 1, smoke = FALSE)
-				L.Stun(50)
+				L.Knockdown(50)
 			else
 				L.visible_message("<span class='warning'>[L] resists being churned!</span>", "<span class='userdanger'>I resist being churned!</span>")
 	..()